From cff814a12a20c52611366269484a782018130f7f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 8 Apr 2011 09:21:15 +0200
Subject: [PATCH] glade3: update to 3.10.0 (gtk+3 port), a new pkg 'glade' will
be imported for gtk+2.
---
srcpkgs/glade3/depends | 2 +-
srcpkgs/glade3/glade3-devel.template | 11 ++++---
...bgladeui.template => libgladeui3.template} | 7 +++--
srcpkgs/glade3/template | 29 ++++++++++---------
xbps-src/common/mapping_shlib_binpkg.txt | 4 ++-
5 files changed, 29 insertions(+), 24 deletions(-)
rename srcpkgs/glade3/{libgladeui.template => libgladeui3.template} (77%)
diff --git a/srcpkgs/glade3/depends b/srcpkgs/glade3/depends
index 50ef8d1544..7f337a72a2 100644
--- a/srcpkgs/glade3/depends
+++ b/srcpkgs/glade3/depends
@@ -1,2 +1,2 @@
-abi_depends=">=3.6.7"
+abi_depends=">=3.10.0"
api_depends="${abi_depends}"
diff --git a/srcpkgs/glade3/glade3-devel.template b/srcpkgs/glade3/glade3-devel.template
index af639f3ea3..64a43b4988 100644
--- a/srcpkgs/glade3/glade3-devel.template
+++ b/srcpkgs/glade3/glade3-devel.template
@@ -7,19 +7,18 @@ long_desc="${long_desc}
Add_dependency run pkg-config
Add_dependency run intltool
-Add_dependency run python-devel
-Add_dependency run gtk+-devel
+Add_dependency run gnome-doc-utils
+Add_dependency run gtk+3-devel
Add_dependency run atk-devel
Add_dependency run glib-devel
Add_dependency run pango-devel
Add_dependency run gdk-pixbuf-devel
-Add_dependency run cairo-devel
Add_dependency run libpng-devel
+Add_dependency run cairo-devel
Add_dependency run freetype-devel
Add_dependency run fontconfig-devel
Add_dependency run libxml2-devel
-Add_dependency run pygtk-devel
-Add_dependency run glade3
+Add_dependency run gobject-introspection
do_install()
{
@@ -27,5 +26,5 @@ do_install()
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+ mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/glade3/libgladeui.template b/srcpkgs/glade3/libgladeui3.template
similarity index 77%
rename from srcpkgs/glade3/libgladeui.template
rename to srcpkgs/glade3/libgladeui3.template
index bcf551a3db..f6124c0cfc 100644
--- a/srcpkgs/glade3/libgladeui.template
+++ b/srcpkgs/glade3/libgladeui3.template
@@ -11,15 +11,18 @@ Add_dependency run atk
Add_dependency run glib
Add_dependency run pango
Add_dependency run gdk-pixbuf
-Add_dependency run cairo
Add_dependency run libpng
+Add_dependency run cairo
Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libxml2
-Add_dependency run gtk+
+Add_dependency run python
+Add_dependency run gtk+3
do_install()
{
install -d ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/glade ${DESTDIR}/usr/lib
+ mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 327f0e7f72..6023a98f93 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,12 +1,13 @@
# Template build file for 'glade3'.
pkgname=glade3
-version=3.6.7
-distfiles="${GNOME_SITE}/${pkgname}/3.6/$pkgname-$version.tar.bz2"
+version=3.10.0
+wrksrc=glade-${version}
+distfiles="${GNOME_SITE}/glade/3.10/glade-$version.tar.bz2"
build_style=gnu_configure
-configure_args="--disable-gnome --disable-scrollkeeper"
+configure_args="--disable-scrollkeeper"
short_desc="A User Interface Designer for GTK+"
maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81
+checksum=7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253
long_desc="
Glade is a RAD tool to enable quick & easy development of user interfaces
for the GTK+ toolkit and the GNOME desktop environment.
@@ -18,38 +19,38 @@ long_desc="
By using GtkBuilder, Glade XML files can be used in numerous programming
languages including C, C++, C#, Vala, Java, Perl, Python and others."
-subpackages="libgladeui $pkgname-devel"
+subpackages="libgladeui3 $pkgname-devel"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run glibc
-Add_dependency run python
-Add_dependency run gtk+
Add_dependency run atk
Add_dependency run glib
Add_dependency run pango
Add_dependency run gdk-pixbuf
-Add_dependency run cairo
Add_dependency run libpng
+Add_dependency run cairo
Add_dependency run freetype
Add_dependency run fontconfig
Add_dependency run libxml2
-Add_dependency run pygtk
-Add_dependency run libgladeui
+Add_dependency run python
+Add_dependency run gtk+3
+Add_dependency run libgladeui3
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency build python-devel
-Add_dependency build gtk+-devel
+Add_dependency build gnome-doc-utils
+Add_dependency build gtk+3-devel
Add_dependency build atk-devel
Add_dependency build glib-devel
Add_dependency build pango-devel
Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
Add_dependency build libpng-devel
+Add_dependency build cairo-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build libxml2-devel
-Add_dependency build pygtk-devel
+Add_dependency build gobject-introspection
+Add_dependency full pygobject
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 98ad7cd79f..804fcbbb76 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -708,7 +708,8 @@ liborc-test-0.4.so orc orc-devel
libgmime-2.4.so gmime gmime-devel
libtotem-plparser.so.17 totem-pl-parser totem-pl-parser-devel
libtotem-plparser-mini.so.17 totem-pl-parser totem-pl-parser-devel
-libgladeui-1.so libgladeui glade3-devel
+libgladeui-1.so libgladeui glade-devel
+libgladeui-2.so libgladeui3 glade3-devel
libgstphotography-0.10.so gst-plugins-bad gst-plugins-bad-devel
libgstbasevideo-0.10.so gst-plugins-bad gst-plugins-bad-devel
libgstsignalprocessor-0.10.so gst-plugins-bad gst-plugins-bad-devel
@@ -803,3 +804,4 @@ libXevie.so libXevie libXevie-devel
libatspi.so at-spi2-core at-spi2-core-devel
libmutter.so mutter mutter-devel
libvte2_90.so vte3 vte3-devel
+libgnome-media-profiles-3.0.so libgnome-media-profiles libgnome-media-profiles-devel