Merge branch 'master' of gparabola:abslibre-mips64el

11 files changed, 91 insertions, 36 deletions

diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 5cb79b831..91fd3b38a 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -13,13 +13,15 @@ license=("GPL")
 depends=('libglade' 'gtk3' 'popt')
 makedepends=('perlxml' 'intltool')
 conflicts=(gnubiff-gtk)
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443')
+source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz
+	gnubiff-2.2.15-glib.patch)
+md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443'
+	 '31bce3b8b43decf0a1df9492cd807024')
 
 build() {
   [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
   cd $srcdir/gnubiff-$pkgver
-
+  patch -Np1 -i ${srcdir}/gnubiff-2.2.15-glib.patch
   ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
 	--disable-fam --disable-gnome
   make
diff --git a/community/gnubiff/gnubiff-2.2.15-glib.patch b/community/gnubiff/gnubiff-2.2.15-glib.patch
new file mode 100644
index 000000000..ed4b0cc5b
--- /dev/null
+++ b/community/gnubiff/gnubiff-2.2.15-glib.patch
@@ -0,0 +1,12 @@
+--- gnubiff-2.2.15.orig/src/gnubiff.cc	2012-01-08 15:55:47.000000000 -0500
++++ gnubiff-2.2.15/src/gnubiff.cc	2012-12-05 06:43:35.161272119 -0500
+@@ -60,7 +60,9 @@
+ #endif
+ 
+ 	// Thread initialization
++        #if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++        #endif
+ 	gdk_threads_init ();
+ 
+ 	//
diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD
index 066ed3ac3..81d1cfd2e 100644
--- a/community/gphpedit/PKGBUILD
+++ b/community/gphpedit/PKGBUILD
@@ -14,11 +14,14 @@ makedepends=('intltool')
 url="http://www.gphpedit.org/"
 options=('!makeflags')
 install=gphpedit.install
-source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz)
-md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525')
+source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz
+	gphpedit-0.9.98RC1-gmodule.patch)
+md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525'
+	 '4eecf974dedbb3d29c64576d2642cd6f')
 
 build() {
   cd ${srcdir}/*$pkgname*
+  patch -Np1 -i ${srcdir}/gphpedit-0.9.98RC1-gmodule.patch
   ./autogen.sh
   LDFLAGS=`pkg-config --libs gtk+-2.0` ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
diff --git a/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch b/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch
new file mode 100644
index 000000000..ecc4db5d7
--- /dev/null
+++ b/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch
@@ -0,0 +1,20 @@
+--- anoopjohn-gphpedit-fe8a12c.orig/configure.ac	2010-05-21 15:25:58.000000000 -0500
++++ anoopjohn-gphpedit-fe8a12c/configure.ac	2012-12-04 02:55:25.519819812 -0500
+@@ -80,6 +80,7 @@
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(WEBKIT,[webkit-1.0])
++PKG_CHECK_MODULES(GMODULE,[gmodule-2.0])
+ 
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+--- anoopjohn-gphpedit-fe8a12c.orig/src/Makefile.am	2010-05-21 15:25:58.000000000 -0500
++++ anoopjohn-gphpedit-fe8a12c/src/Makefile.am	2012-12-04 03:36:55.239679234 -0500
+@@ -92,6 +92,6 @@
+ 	cd gtkscintilla2 && $(MAKE) libgtkscintilla2.a && cd ..
+ 
+ gphpedit_LDADD = \
+-	$(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS)\
++	$(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS) $(GMODULE_LIBS)\
+ 	gtkscintilla2/libgtkscintilla2.a\
+ 	gtkscintilla2/scintilla/bin/scintilla.a
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD
index 8edc7723f..f96c1fada 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -12,11 +12,14 @@ license=(GPL)
 depends=('gtk2+extra' 'popt')
 makedepends=('gtk2+extra')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c994c23d2d75056dbefcf5d1d63596d7')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	gpsim-0.26.1-glib.patch)
+md5sums=('c994c23d2d75056dbefcf5d1d63596d7'
+	 'ddc2ffc384ae37020cffb56d68b2fe04')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gpsim-0.26.1-glib.patch
   ./configure --prefix=/usr
   make
   make DESTDIR=${pkgdir} install
diff --git a/community/gpsim/gpsim-0.26.1-glib.patch b/community/gpsim/gpsim-0.26.1-glib.patch
new file mode 100644
index 000000000..0088ca836
--- /dev/null
+++ b/community/gpsim/gpsim-0.26.1-glib.patch
@@ -0,0 +1,24 @@
+--- gpsim-0.26.1.orig/src/bitlog.h	2010-06-05 01:46:30.000000000 -0500
++++ gpsim-0.26.1/src/bitlog.h	2012-12-04 08:32:03.327155186 -0500
+@@ -25,7 +25,7 @@
+ 
+ // include the absolute minimum portion of GLIB to get the definitions
+ // for guint64, etc.
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+ /**********************************************************************
+  * boolean event logging
+
+--- gpsim-0.26.1.orig/src/os_dependent.cc	2010-06-05 01:46:30.000000000 -0500
++++ gpsim-0.26.1/src/os_dependent.cc	2012-12-04 08:50:22.684064974 -0500
+@@ -39,8 +39,7 @@
+ #ifdef _WIN32
+ #define G_PLATFORM_WIN32
+ #define G_OS_WIN32
+-#include <glib/gmem.h>
+-#include <glib/gwin32.h>
++#include <glib.h>
+ #include <direct.h>
+ #include <windows.h>
+ 
diff --git a/community/gtk2+extra/PKGBUILD b/community/gtk2+extra/PKGBUILD
index ba4d2ebae..73e8633d8 100644
--- a/community/gtk2+extra/PKGBUILD
+++ b/community/gtk2+extra/PKGBUILD
@@ -12,13 +12,16 @@ depends=('gtk2')
 license=('LGPL')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz
-	build-fix.patch)
+	build-fix.patch
+	gtk2+extra-2.1.2-glib.patch)
 md5sums=('10779394f39d39115fa3fd0f3dea4436'
-         '114c10e7dc14dc78fc38189ee82fa225')
+         '114c10e7dc14dc78fc38189ee82fa225'
+	 'b05e0caeaf9d05f2167c46a89406f686')
 
 build() {
   cd $srcdir/gtk+extra-$pkgver
   patch -p1 <$srcdir/build-fix.patch
+  patch -Np1 -i ${srcdir}/gtk2+extra-2.1.2-glib.patch
   ./configure --prefix=/usr
   make
   make DESTDIR=$pkgdir install
diff --git a/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch b/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch
new file mode 100644
index 000000000..19f170606
--- /dev/null
+++ b/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch
@@ -0,0 +1,11 @@
+--- gtk+extra-2.1.2.orig/gtkextra/gtkcharsel.c	2004-08-27 16:46:14.000000000 -0500
++++ gtk+extra-2.1.2/gtkextra/gtkcharsel.c	2012-12-04 06:13:06.926662933 -0500
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ #include "gtkcharsel.h"
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index 32432afb0..9ea255b4b 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jbig2dec
 pkgver=0.11
 pkgrel=5
 pkgdesc="decoder implementation of the JBIG2 image compression format"
-arch=('x86_64' 'i686' 'mips64el')
+arch=('x86_64' 'i686')
 url="http://jbig2dec.sourceforge.net/"
 license=('GPL3')
 depends=('glibc' 'libpng')
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index 8193c66b9..9caba7996 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -19,12 +19,11 @@ build() {
   make
 }
 
-package_libxmlplusplus() {
+package_libxml++() {
   pkgdesc="C++ bindings to libxml2"
   depends=('libxml2' 'glibmm')
   replaces=('libxml++2')
-  provides=("libxml++2=${pkgver}"
-            "libxml++=${pkgver}")
+  provides=("libxml++2=${pkgver}")
   conflicts=('libxml++2')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -32,10 +31,9 @@ package_libxmlplusplus() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_libxmlplusplus-docs() {
+package_libxml++-docs() {
   pkgdesc="Developer documentation for libxml++"
   depends=('glibmm-docs')
-  provides=("libxmlplusplus-docs=${pkgver}")
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install-data-local install-dist_referenceDATA
 }
diff --git a/extra/seahorse/10_gpgme_keyring_finalize_typo.patch b/extra/seahorse/10_gpgme_keyring_finalize_typo.patch
deleted file mode 100644
index 86e9e23c3..000000000
--- a/extra/seahorse/10_gpgme_keyring_finalize_typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5286af2304b3a59a2deeb508433c13d96fe2287c Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 30 Apr 2012 18:29:42 +0000
-Subject: Fix typo in finalizing of GPGME keyring
-
----
-diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
-index 79ff39b..579ab09 100644
---- a/pgp/seahorse-gpgme-keyring.c
-+++ b/pgp/seahorse-gpgme-keyring.c
-@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
- {
- 	SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
- 
--	g_clear_object (self->pv->actions);
-+	g_clear_object (&self->pv->actions);
- 	g_hash_table_destroy (self->pv->keys);
- 
- 	/* All monitoring and scheduling should be done */
---
-cgit v0.9.0.2