Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=2bebd95bc3d36cec35b551234eabde7556703c97

commit 2bebd95bc3d36cec35b551234eabde7556703c97
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Nov 6 19:19:16 2010 +0000

nm-applet-0.8.2-1-i686
*version bump

diff --git a/source/gnome-extra/nm-applet/DGSEAL_ENABLE.diff 
b/source/gnome-extra/nm-applet/DGSEAL_ENABLE.diff
deleted file mode 100644
index d4317d6..0000000
--- a/source/gnome-extra/nm-applet/DGSEAL_ENABLE.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0e85376c5e7512225023918461881cb13aea22f3 Mon Sep 17 00:00:00 2001
-From: Mirsal Ennaime <mirsal.enna...@gmail.com>
-Date: Mon, 02 Aug 2010 22:19:35 +0000
-Subject: applet: fix compilation with -DGSEAL_ENABLE (bgo #615653)
-
-This patch substitutes all direct access to Gtk+ object fields
-with accessor functions in order to fulfill the UseGseal goal
-as described at http://live.gnome.org/GnomeGoals/UseGseal
-
-It also requires to bump the required Gtk+ version to 2.18
----
-diff --git a/configure.ac b/configure.ac
-index 5871561..e11aa21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(NMA,
-                libnm-glib >= 0.8.1
-                libnm-util >= 0.8.1
-                libnm-glib-vpn >= 0.8.1
--               gtk+-2.0 >= 2.14
-+               gtk+-2.0 >= 2.18
-                libglade-2.0
-                gmodule-export-2.0
-                gconf-2.0
-diff --git a/src/applet.c b/src/applet.c
-index 2734045..d7ab47f 100644
---- a/src/applet.c
-+++ b/src/applet.c
-@@ -482,6 +482,7 @@ applet_new_menu_item_helper (NMConnection *connection,
- static gboolean
- menu_title_item_expose (GtkWidget *widget, GdkEventExpose *event)
- {
-+      GtkAllocation allocation;
-       GtkStyle *style;
-       GtkWidget *label;
-       PangoFontDescription *desc;
-@@ -509,7 +510,8 @@ menu_title_item_expose (GtkWidget *widget, GdkEventExpose 
*event)
-       /* We also need to reposition the cairo context so that (0, 0) is the
-        * top-left of where we're supposed to start drawing.
-        */
--      cairo_translate (cr, widget->allocation.x, widget->allocation.y);
-+      gtk_widget_get_allocation (widget, &allocation);
-+      cairo_translate (cr, allocation.x, allocation.y);
-
-       text = gtk_label_get_text (GTK_LABEL (label));
-
-diff --git a/src/utils/nma-bling-spinner.c b/src/utils/nma-bling-spinner.c
-index 5522046..ceecaf8 100644
---- a/src/utils/nma-bling-spinner.c
-+++ b/src/utils/nma-bling-spinner.c
-@@ -71,26 +71,23 @@ draw (GtkWidget *widget, cairo_t *cr)
-       double radius;
-       double half;
-       int i;
--      int width, height;
-
-+      GtkAllocation allocation;
-       NmaBlingSpinnerPrivate *priv;
-
-       priv = NMA_BLING_SPINNER_GET_PRIVATE (widget);
-
-       cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
--      width = widget->allocation.width;
--      height = widget->allocation.height;
--
--      if ( (width < 12) || (height <12) )
-+      gtk_widget_get_allocation (widget, &allocation);
-+      if ((allocation.width < 12) || (allocation.height < 12))
-               gtk_widget_set_size_request(widget, 12, 12);
-
--      //x = widget->allocation.x + widget->allocation.width / 2;
--      //y = widget->allocation.y + widget->allocation.height / 2;
--      x = widget->allocation.width / 2;
--      y = widget->allocation.height / 2;
--      radius = MIN (widget->allocation.width  / 2,
--                                widget->allocation.height / 2);
-+      //x = allocation.x + allocation.width / 2;
-+      //y = allocation.y + allocation.height / 2;
-+      x = allocation.width / 2;
-+      y = allocation.height / 2;
-+      radius = MIN (allocation.width / 2, allocation.height / 2);
-       half = priv->lines / 2;
-
-       /*FIXME: render in B&W for non transparency */
-@@ -154,7 +151,7 @@ nma_bling_spinner_init (NmaBlingSpinner *spinner)
-       priv->current = 0;
-       priv->timeout = 0;
-
--      GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW);
-+      gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
- }
-
- static gboolean
---
-cgit v0.8.3.1
diff --git a/source/gnome-extra/nm-applet/FrugalBuild 
b/source/gnome-extra/nm-applet/FrugalBuild
index 831eb71..50e9c4f 100644
--- a/source/gnome-extra/nm-applet/FrugalBuild
+++ b/source/gnome-extra/nm-applet/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=nm-applet
_F_gnome_name=network-manager-applet
-pkgver=0.8.1
-pkgrel=2
+pkgver=0.8.2
+pkgrel=1
pkgdesc="Network Management applet"
depends=('gconf' 'gtk+2>=2.22.0' 'libglade' 'gnome-keyring>=2.32.0' 
'libgnomeui' 'gnome-panel' \
-       'networkmanager>=0.8.1' 'polkit-gnome' 'gnome-bluetooth' 
'mobile-broadband-provider-info')
+       'networkmanager>=0.8.2' 'polkit-gnome' 'gnome-bluetooth' 
'mobile-broadband-provider-info')
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
@@ -15,11 +15,9 @@ archs=('i686' 'x86_64' 'ppc')
_F_gnome_desktop="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=($source dbus-access.diff DGSEAL_ENABLE.diff glib226.diff)
-sha1sums=('6259f40c849e9a7881f1d7319d1ddd50335db480' \
-          '85e225293d475c1c030496b29e116321824c45f0' \
-          '9a587ab17865917a3c177c422edf8cb427158946' \
-          'ac234a1b3351280cbd2d74bfb1b5c7b69f0b72e9')
+source=($source dbus-access.diff)
+sha1sums=('1be46b1df52786cd22e1d3d888f828c27d46dd3a' \
+          '85e225293d475c1c030496b29e116321824c45f0')
_F_cd_path=$_F_gnome_name-$pkgver

build()
diff --git a/source/gnome-extra/nm-applet/glib226.diff 
b/source/gnome-extra/nm-applet/glib226.diff
deleted file mode 100644
index 740bf90..0000000
--- a/source/gnome-extra/nm-applet/glib226.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From fa9fc090e59c3b1745da05e066a335d516b756d4 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vu...@gnome.org>
-Date: Mon, 09 Aug 2010 15:34:11 +0000
-Subject: build: fix compilation with glib >= 2.25.12 (bgo #626424)
-
-Work around API breakage in glib.
----
-diff --git a/src/utils/tests/test-utils.c b/src/utils/tests/test-utils.c
-index 7eb1ffa..83b8ffe 100644
---- a/src/utils/tests/test-utils.c
-+++ b/src/utils/tests/test-utils.c
-@@ -413,7 +413,11 @@ test_ap_hash_foobar_asdf11_adhoc_wpa_rsn (void *f, 
TestData *d)
-       g_assert (strcmp (d->foobar_adhoc_wpa_rsn, d->asdf11_adhoc_wpa_rsn));
- }
-
-+#if GLIB_CHECK_VERSION(2,25,12)
-+typedef GTestFixtureFunc TCFunc;
-+#else
- typedef void (*TCFunc)(void);
-+#endif
-
- #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
-
---
-cgit v0.8.3.1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to