Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from Debian packaging #21

Merged
merged 8 commits into from Aug 9, 2016
Merged

Conversation

olekw
Copy link
Contributor

@olekw olekw commented Jul 25, 2016

These six commits are based on changes to Ember in Debian. Four are based on Debian policy-mandated fixes and two are just errors noticed while preparing the Debian package. All of these changes should be useful in Ember outside of Debian, ergo this pull request.

Written by Stephen M. Webb <stephen.webb@bregmasoft.ca> for Debian in 2013
Avoids code duplication since Ember already uses functions from that header
in WFMath in a number of places.
These were identified by lintian during Debian packaging. A few inconsistent
line endings were also corrected because they prevented this patch from being
applied cleanly.
@erikogenvik
Copy link
Member

These all look good. The only one I'm a bit wary about is the addition of "objects-subdir". I remember testing adding it to Cyphesis and Ember some years ago (when the build system started complaining about it) but ran into trouble. I don't exactly remember the cause; either there were something which didn't fully work, or it was an issue with backwards-compatibility. I'll do some more tests.

However, will there also be patches for Cyphesis? The problem is that these patches relies on the patches for wfmath, but those patches will currently break Cyphesis.

@erikogenvik
Copy link
Member

Ok, just verified that the subdir-objects directive doesn't build on Ubuntu 16.04 at least due to how src/main/Makefile.am references source files using absolute path.
Which is something we have in order to make it easier to build the WebEmber plugin.
But does it compile on Debian?

@olekw
Copy link
Contributor Author

olekw commented Jul 28, 2016

Erik: Yes, let's definitely get to the bottom of this! The strange thing is that Ember compiles perfectly on Debian Sid. Could you please send me your build log file? Also, I'm not aware of any problems in Cyphesis. Cyphesis has been building perfectly on 19 different architectures in Debian for about 21 months using the patched WFMath package. Again, if you see a build failure please send me your log file and I'll do my best to track down the problem!

Make the icon location compliant with the Icon Theme Specification.
See the following for more information: 
https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html
@olekw
Copy link
Contributor Author

olekw commented Aug 5, 2016

Erik: I was concerned that there might be a problem with my build environment so I built the Ember package in my Ubuntu PPA. It built without any problems. See here for build log etc.: https://launchpad.net/~olekw/+archive/ubuntu/worldforge/+build/10540492

Also, just added another commit to make the icon location compliant with the Icon Theme Specification. It apparently wasn't showing up on people's menus. I was able to confirm the missing icon behavior in Xfce but it was also reported in KDE.

Since there is a make rule for the ember script, and the script is not distributed in it's installable form, bin_SCRIPTS should be used and
dist_bin_SCRIPTS is not appropriate.
Reference: https://www.gnu.org/software/automake/manual/html_node/Scripts.html
This was causing some parallel build failures.
@olekw
Copy link
Contributor Author

olekw commented Aug 6, 2016

And another addition, I was finally able to track down what was causing some random build failures such as this one: https://launchpadlibrarian.net/276660069/buildlog_ubuntu-yakkety-amd64.ember_0.7.2+dfsg-1ubuntu1_BUILDING.txt.gz

@erikogenvik
Copy link
Member

Awesome! I've been seeing those random build failures for a while, but they were never enough frequent for me to figure out what was wrong.

I've also found the cause of the build failures. Caused by a bug in Automake, which doesn't expand paths when subdir-objects is used. See https://lists.gnu.org/archive/html/automake/2015-08/msg00004.html and http://debbugs.gnu.org/13928.
I have a fix.

@erikogenvik erikogenvik merged commit ef880ea into worldforge:master Aug 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants