merged x11 repository into main

ref #255

6 files changed, 93 insertions, 0 deletions

diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
new file mode 100644
index 0000000000..b999bd4ae4
--- /dev/null
+++ b/main/libglade/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libglade
+pkgver=2.6.4
+pkgrel=0
+pkgdesc="Allows you to load glade interface files in a program at runtime"
+url="http://www.gnome.org"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+makedepends="python pkgconfig gtk+-dev libxml2-dev gettext-dev libiconv-dev
+	expat-dev"
+install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade
+	$pkgname.post-deinstall"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.6/$pkgname-$pkgver.tar.bz2
+	$pkgname-2.0.1-nowarning.patch
+	$install
+	"
+
+depends_dev="gtk+-dev libxml2-dev"
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -Np1 -i "$srcdir"/libglade-2.0.1-nowarning.patch || return 1
+	./configure --sysconfdir=/etc \
+		--prefix=/usr \
+		--localstatedir=/var || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -m755 libglade-convert "$pkgdir"/usr/bin/ || return 1
+}
+md5sums="d1776b40f4e166b5e9c107f1c8fe4139  libglade-2.6.4.tar.bz2
+4f879c0ce550004905aa0fb24f25c353  libglade-2.0.1-nowarning.patch
+9083bddf8edd4a116bec36df3866e9bf  libglade.post-install
+964867abf7ceafdce9640b08f34ce090  libglade.pre-upgrade
+9083bddf8edd4a116bec36df3866e9bf  libglade.post-upgrade
+964867abf7ceafdce9640b08f34ce090  libglade.post-deinstall"
diff --git a/main/libglade/libglade-2.0.1-nowarning.patch b/main/libglade/libglade-2.0.1-nowarning.patch
new file mode 100644
index 0000000000..fd071215fa
--- /dev/null
+++ b/main/libglade/libglade-2.0.1-nowarning.patch
@@ -0,0 +1,39 @@
+--- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
++++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
+@@ -639,9 +639,8 @@
+ 		if (!strcmp (childinfo->properties[j].name, "label")) {
+ 		    label = childinfo->properties[j].value;
+ 		    break;
+-		} else {
+-		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
+ 		}
++		/* Ignore all other properties */
+ 	    }
+ 
+ 	    if (label) {
+@@ -683,6 +682,7 @@
+ 	    char *icon = NULL;
+ 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
+ 	    gboolean use_underline = FALSE;
++	    gboolean sensitive = TRUE;
+ 	    GtkWidget *iconw = NULL;
+ 	    int j;
+ 
+@@ -708,6 +708,8 @@
+ 		    group_name = value;
+ 		} else if (!strcmp (name, "new_group")) {
+ 		    new_group = BOOL (value);
++		} else if (!strcmp (name, "sensitive")) {
++		    sensitive = BOOL (value);
+ 		} else if (!strcmp (name, "visible")) {
+ 		    /* ignore for now */
+ 		} else if (!strcmp (name, "tooltip")) {
+@@ -785,6 +787,8 @@
+ 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
+ 					     TRUE);
+ 	    }
++	    
++	    gtk_widget_set_sensitive (child, sensitive);
+ 
+ 	    glade_xml_set_common_params (xml, child, childinfo->child);
+ 	} else {
diff --git a/main/libglade/libglade.post-deinstall b/main/libglade/libglade.post-deinstall
new file mode 100644
index 0000000000..1b368de845
--- /dev/null
+++ b/main/libglade/libglade.post-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+xmlcatalog --noout --del \
+	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
+
diff --git a/main/libglade/libglade.post-install b/main/libglade/libglade.post-install
new file mode 100644
index 0000000000..2188b75635
--- /dev/null
+++ b/main/libglade/libglade.post-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir -p etc/xml
+
+if [ ! -e etc/xml/catalog ]; then
+	xmlcatalog --noout --create etc/xml/catalog
+fi
+
+xmlcatalog --noout --add "system" \
+	"http://glade.gnome.org/glade-2.0.dtd" \
+	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
+
diff --git a/main/libglade/libglade.post-upgrade b/main/libglade/libglade.post-upgrade
new file mode 120000
index 0000000000..25d67c626e
--- /dev/null
+++ b/main/libglade/libglade.post-upgrade
@@ -0,0 +1 @@
+libglade.post-install
\ No newline at end of file
diff --git a/main/libglade/libglade.pre-upgrade b/main/libglade/libglade.pre-upgrade
new file mode 120000
index 0000000000..06b72fb37b
--- /dev/null
+++ b/main/libglade/libglade.pre-upgrade
@@ -0,0 +1 @@
+libglade.post-deinstall
\ No newline at end of file