diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
| commit | ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch) | |
| tree | 365b7a8276a93d738840c4481a1ff5e327920738 /testing/celestia/celestia-1.6.1-linking.patch | |
| parent | 37936150d275890b518542e93a435ab5815d722b (diff) | |
| parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/conntrack-tools/01-config-file-path.patch
community-testing/conntrack-tools/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gigi/PKGBUILD
community-testing/glob2/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haddock/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libnetfilter_conntrack/PKGBUILD
community/libnetfilter_queue/PKGBUILD
community/libnfnetlink/PKGBUILD
community/sfk/PKGBUILD
extra/cabal-install/PKGBUILD
extra/claws-mail/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
social/squirm/PKGBUILD
staging/kdebindings-python/PKGBUILD
testing/curl/PKGBUILD
testing/dnsutils/PKGBUILD
testing/dnsutils/remove-bind.patch
testing/mesa/PKGBUILD
testing/openldap/PKGBUILD
testing/pam/PKGBUILD
testing/subversion/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'testing/celestia/celestia-1.6.1-linking.patch')
| -rw-r--r-- | testing/celestia/celestia-1.6.1-linking.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch new file mode 100644 index 000000000..d610d5243 --- /dev/null +++ b/testing/celestia/celestia-1.6.1-linking.patch @@ -0,0 +1,54 @@ +Fix linking issues: + * underlinking GLUT (bug #372123, #387609) + * as-needed (bug #281258) + +--- a/src/celestia/Makefile.am ++++ b/src/celestia/Makefile.am +@@ -7,14 +7,15 @@ + + if ENABLE_KDE + SUBDIRS += kde +-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ +- $(LIBSOCKET) -lDCOP kde/libkdegui.a ++celestiaKDELIBS = kde/libkdegui.a + celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP + endif + + if ENABLE_GTK + SUBDIRS += gtk +-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++celestiaGTKLIBS = gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ +@@ -62,6 +63,7 @@ + + if ENABLE_GLUT + GLUTSOURCES = glutmain.cpp ++GLUTLIBS = -lGL + endif + + if ENABLE_THEORA +@@ -80,15 +82,16 @@ + celestia_LDADD = \ + $(celestiaKDELIBS) \ + $(celestiaGTKLIBS) \ +- $(DL_LIBS) \ +- $(LUA_LIBS) \ +- $(THEORA_LIBS) \ + ../celengine/libcelengine.a \ + ../celtxf/libceltxf.a \ + ../cel3ds/libcel3ds.a \ + ../celmath/libcelmath.a \ + ../celutil/libcelutil.a \ +- $(SPICE_LIBS) ++ $(LUA_LIBS) \ ++ $(THEORA_LIBS) \ ++ $(GLUTLIBS) \ ++ $(SPICE_LIBS) \ ++ $(DL_LIBS) + + noinst_HEADERS = $(wildcard *.h) + noinst_DATA = ../../celestia |