diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-26 13:26:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-26 13:26:07 +0000 |
| commit | a24442c823c566c3378eaee51a3dc205d6b1f656 (patch) | |
| tree | 29dad6530550bd30f2fcd687afefeb22672d5141 | |
| parent | 50e3c80a285c9b6e65c00a273bc3a04f3d76cf8e (diff) | |
| download | aports-a24442c823c566c3378eaee51a3dc205d6b1f656.tar.bz2 aports-a24442c823c566c3378eaee51a3dc205d6b1f656.tar.xz | |
main/geany: build fix for glib 2.32
| -rw-r--r-- | main/geany/APKBUILD | 14 | ||||
| -rw-r--r-- | main/geany/link-gmodule.patch | 11 |
2 files changed, 22 insertions, 3 deletions
diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD index 61089ab342..aa9c243ace 100644 --- a/main/geany/APKBUILD +++ b/main/geany/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=geany pkgver=0.21 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and lightweight IDE" url="http://www.geany.org" arch="all" @@ -35,11 +35,18 @@ source="http://download.$pkgname.org/$pkgname-$pkgver.tar.gz http://download.geany.org/contrib/tags/wordpress.php.tags http://download.geany.org/contrib/tags/xfce46.c.tags http://advamacs.com/pub/tcl.tcl.tags + link-gmodule.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done # set default terminal to Terminal sed -e 's/xterm/Terminal/g' \ -i src/keyfile.c @@ -105,4 +112,5 @@ faa05eceb4d806e0c9f7476e4644a65b v4l2.c.tags d046ab5c4e7ab2a6ba8961285edc4b2d webkit-1.0.c.tags 0e51399cc03d094d15b389a2f89dea51 wordpress.php.tags 8f873570cc244b9185ae26e560887490 xfce46.c.tags -4821553235a2b6752356229ba64631b6 tcl.tcl.tags" +4821553235a2b6752356229ba64631b6 tcl.tcl.tags +5e47a67fd3ce35a8b9a21890082cd6cd link-gmodule.patch" diff --git a/main/geany/link-gmodule.patch b/main/geany/link-gmodule.patch new file mode 100644 index 0000000000..a274f26d30 --- /dev/null +++ b/main/geany/link-gmodule.patch @@ -0,0 +1,11 @@ +--- ./src/Makefile.in.orig ++++ ./src/Makefile.in +@@ -398,7 +398,7 @@ + # build Geany for Windows on non-Windows systems (cross-compile) + @MINGW_TRUE@geany_SOURCES = $(SRCS) win32.c win32.h + @MINGW_FALSE@geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ +-@MINGW_FALSE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) ++@MINGW_FALSE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lgmodule-2.0 + + @MINGW_TRUE@geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ + @MINGW_TRUE@ @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ |