From a32b4c4cb832f7eb5b6ab1d7ae82aa9c28eb3c07 Mon Sep 17 00:00:00 2001 From: sibel Date: Sat, 12 Jun 2010 07:56:43 +0200 Subject: Maj de gir-repository#0.6.5-4 --- gnome/gir-repository/.footprint | 2 + gnome/gir-repository/.md5sum | 1 + gnome/gir-repository/Pkgfile | 14 +++- .../gir-repository-0.6.5-dbus-glib-2.patch | 92 ++++++++++++++++++++++ 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch (limited to 'gnome') diff --git a/gnome/gir-repository/.footprint b/gnome/gir-repository/.footprint index 28c500070..62fef8799 100644 --- a/gnome/gir-repository/.footprint +++ b/gnome/gir-repository/.footprint @@ -6,6 +6,7 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/AvahiCore-0.6.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/Babl-0.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/DBus-1.0.typelib +-rw-r--r-- root/root usr/lib/girepository-1.0/DBusGLib-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GConf-2.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GMenu-2.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/Gdk-2.0.typelib @@ -39,6 +40,7 @@ drwxr-xr-x root/root usr/share/gir-1.0/ -rw-r--r-- root/root usr/share/gir-1.0/AvahiCore-0.6.gir -rw-r--r-- root/root usr/share/gir-1.0/Babl-0.0.gir -rw-r--r-- root/root usr/share/gir-1.0/DBus-1.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/DBusGLib-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GConf-2.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GMenu-2.0.gir -rw-r--r-- root/root usr/share/gir-1.0/Gdk-2.0.gir diff --git a/gnome/gir-repository/.md5sum b/gnome/gir-repository/.md5sum index 2d3402598..442b22e4a 100644 --- a/gnome/gir-repository/.md5sum +++ b/gnome/gir-repository/.md5sum @@ -1 +1,2 @@ +e4325f0a06e853b85a460d437a5be854 gir-repository-0.6.5-dbus-glib-2.patch f161fa1ae161e81117af6f4bb79bf344 gir-repository-0.6.5.tar.bz2 diff --git a/gnome/gir-repository/Pkgfile b/gnome/gir-repository/Pkgfile index 03f7e45c8..65239e32f 100644 --- a/gnome/gir-repository/Pkgfile +++ b/gnome/gir-repository/Pkgfile @@ -1,16 +1,22 @@ -# Description: Dépot de fichiers d'interface GIR # URL: http:// # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch # Depends on: avahi, gobject-introspection, gtk, libsoup, gconf, gnome-menus, gnome-keyring, gtksourceview, libnotify, pango, poppler-glib, vte, libwnck, babl, startup-notification +#gstreamer, gnupng, cairo + name=gir-repository version=0.6.5 -release=1 -source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2) +release=4 +source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2 \ + gir-repository-0.6.5-dbus-glib-2.patch) + build() { cd $name-$version - ./configure --prefix=$GNOME_PREFIX + patch -Np1 -i ../gir-repository-0.6.5-dbus-glib-2.patch + ./configure --prefix=$GNOME_PREFIX make make DESTDIR=$PKG install +# rm $PKG/usr/lib/girepository-1.0/GMenu-2.0.typelib +# rm $PKG/usr/share/gir-1.0/GMenu-2.0.gir } diff --git a/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch b/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch new file mode 100644 index 000000000..941a1652a --- /dev/null +++ b/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch @@ -0,0 +1,92 @@ +Submitted By: Wayne Blaszczyk +Date: 2010-06-07 +Initial Package Version: 0.6.5 +Origin: http://git.gnome.org/browse/gir-repository/log/ +Upstream Status: commited +Description: Fixed various DBusGLib-1.0.gir issues. + +diff -Naur gir-repository-0.6.5/gir/DBusGLib-1.0.gir gir-repository-0.6.5-patched/gir/DBusGLib-1.0.gir +--- gir-repository-0.6.5/gir/DBusGLib-1.0.gir 2009-07-10 03:31:54.000000000 +1000 ++++ gir-repository-0.6.5-patched/gir/DBusGLib-1.0.gir 2010-06-07 19:17:14.000000000 +1000 +@@ -2,8 +2,9 @@ + +- ++ xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> ++ ++ + + + +@@ -11,16 +12,14 @@ + glib:type-name="DBusGProxy" glib:get-type="dbus_g_proxy_get_type"> + + +- +- ++ + + + + +- +- +- ++ ++ ++ + + + +diff -Naur gir-repository-0.6.5/gir/Makefile.am gir-repository-0.6.5-patched/gir/Makefile.am +--- gir-repository-0.6.5/gir/Makefile.am 2009-08-29 11:42:39.000000000 +1000 ++++ gir-repository-0.6.5-patched/gir/Makefile.am 2010-06-07 19:17:14.000000000 +1000 +@@ -12,8 +12,7 @@ + endif + EXTRA_DIST += $(AVAHI_GIRSOURCES) + +-MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \ +- TelepathyGLib.gir \ ++MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \ + LibTelepathy.gir + if BUILD_MISSIONCONTROL + CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES) +@@ -29,6 +28,8 @@ + EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h + + if BUILD_DBUS ++CUSTOM_GIRSOURCES += DBusGLib-1.0.gir ++ + DBus-1.0.gir: libgirepo-DBus-custom.la + $(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \ + --add-include-path=$(srcdir) --add-include-path=. \ +diff -Naur gir-repository-0.6.5/gir/Makefile.in gir-repository-0.6.5-patched/gir/Makefile.in +--- gir-repository-0.6.5/gir/Makefile.in 2009-09-10 05:31:46.000000000 +1000 ++++ gir-repository-0.6.5-patched/gir/Makefile.in 2010-06-07 20:02:51.000000000 +1000 +@@ -37,6 +37,7 @@ + host_triplet = @host@ + @BUILD_AVAHI_TRUE@am__append_1 = $(AVAHI_GIRSOURCES) + @BUILD_MISSIONCONTROL_TRUE@am__append_2 = $(MISSIONCONTROL_GIRSOURCES) ++@BUILD_DBUS_TRUE@am__append_41 = DBusGLib-1.0.gir + @BUILD_DBUS_TRUE@am__append_3 = DBus-1.0.gir + @BUILD_DBUS_TRUE@am__append_4 = libgirepo-DBus-custom.la + @BUILD_GCONF_TRUE@am__append_5 = GConf-2.0.gir +@@ -396,12 +397,12 @@ + $(am__append_33) $(am__append_34) $(am__append_35) \ + $(am__append_36) $(am__append_37) $(am__append_38) \ + $(am__append_39) $(am__append_40) +-CUSTOM_GIRSOURCES = $(am__append_1) $(am__append_2) $(am__append_17) ++CUSTOM_GIRSOURCES = $(am__append_1) $(am__append_2) $(am__append_17) \ ++ $(am__append_41) + XPATH_TESTS = $(am__append_14) $(am__append_18) $(am__append_24) + COMMON_CUSTOM_LDFLAGS = -avoid-version -rdynamic + AVAHI_GIRSOURCES = AvahiCore-0.6.gir +-MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \ +- TelepathyGLib.gir \ ++MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \ + LibTelepathy.gir + + libgirepo_DBus_custom_la_CPPFLAGS = $(DBUS_CFLAGS) -- cgit v1.2.3-54-g00ecf