[arch-commits] Commit in lxpanel/trunk (3 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Nov 15 11:00:47 UTC 2014


    Date: Saturday, November 15, 2014 @ 12:00:46
  Author: foutrelis
Revision: 122592

upgpkg: lxpanel 0.7.2-1

New upstream release.

Modified:
  lxpanel/trunk/PKGBUILD
Deleted:
  lxpanel/trunk/lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
  lxpanel/trunk/lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch

--------------------------------------------------------------------------+
 PKGBUILD                                                                 |   24 -
 lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch |  169 ----------
 lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch      |   30 -
 3 files changed, 4 insertions(+), 219 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-15 05:02:44 UTC (rev 122591)
+++ PKGBUILD	2014-11-15 11:00:46 UTC (rev 122592)
@@ -4,8 +4,8 @@
 # Contributor: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=lxpanel
-pkgver=0.7.1
-pkgrel=3
+pkgver=0.7.2
+pkgrel=1
 pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,25 +14,9 @@
 depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck' 'libfm')
 makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.xz
-        lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
-		lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch)
-sha256sums=('45a9a511287ceb6177d0688f828b0974ebeae8655e05e2a52dddbe0bae30b026'
-            '01a46dc9dd949ef93f27bfd59514e5a88068f618cc0399176a99ecef4aab6aaf'
-            '2428aaed87e6d4d3930524b6fb1422e7fbdfb86e5ea4e78dd0dba9b18959f11e')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.xz)
+sha256sums=('bbc9924b2e3b082207da7f6a659ad9454222d329e8952ff1257f2debf95e3135')
 
-prepare() {
-  cd $pkgname-$pkgver
-
-  # http://sourceforge.net/p/lxde/bugs/679/
-  # https://bugs.archlinux.org/task/42178
-  patch -Np1 -i ../lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
-
-  # https://sourceforge.net/p/lxde/bugs/680/
-  # https://bugs.archlinux.org/task/42226
-  patch -Np1 -i ../lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   CFLAGS+=' -lgmodule-2.0' ./configure \

Deleted: lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
===================================================================
--- lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch	2014-11-15 05:02:44 UTC (rev 122591)
+++ lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch	2014-11-15 11:00:46 UTC (rev 122592)
@@ -1,169 +0,0 @@
-From 0bfcc6c97fca70de51acf06396578ddd7f03e9b1 Mon Sep 17 00:00:00 2001
-From: Andriy Grytsenko <andrej at rep.kiev.ua>
-Date: Wed, 24 Sep 2014 16:51:08 +0300
-Subject: [PATCH] [SF#679]X11 library uses unsigned long as cardinal-32 data,
- not uint32_t.
-
-That lead to invalid strut setting after 5cc945e412002531bb349a0443c837393ce57c43
-And it might lead to other bugs on 64-bit architectures as well,
-may be just not reported yet or not reproduced yet.
----
- plugins/launchtaskbar.c |  2 +-
- src/ev.c                |  4 ++--
- src/misc.c              | 10 +++++-----
- src/panel.c             | 12 ++++++------
- src/private.h           |  2 +-
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c
-index 804c6e5..89c9a0b 100644
---- a/plugins/launchtaskbar.c
-+++ b/plugins/launchtaskbar.c
-@@ -2690,7 +2690,7 @@ static void taskbar_button_size_allocate(GtkWidget * btn, GtkAllocation * alloc,
- 
- 
-         /* Send a NET_WM_ICON_GEOMETRY property change on the window. */
--        guint32 data[4];
-+        gulong data[4];
-         data[0] = x;
-         data[1] = y;
-         data[2] = alloc->width;
-diff --git a/src/ev.c b/src/ev.c
-index e4dd66e..bf47fe0 100644
---- a/src/ev.c
-+++ b/src/ev.c
-@@ -290,7 +290,7 @@ fb_ev_current_desktop(FbEv *ev)
- {
-     ENTER;
-     if (ev->current_desktop == -1) {
--        guint32 *data;
-+        gulong *data;
- 
-         data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0);
-         if (data) {
-@@ -307,7 +307,7 @@ fb_ev_number_of_desktops(FbEv *ev)
- {
-     ENTER;
-      if (ev->number_of_desktops == -1) {
--        guint32 *data;
-+        gulong *data;
- 
-         data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS, XA_CARDINAL, 0);
-         if (data) {
-diff --git a/src/misc.c b/src/misc.c
-index fb16893..f15961b 100644
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -542,7 +542,7 @@ get_xaproperty (Window win, Atom prop, Atom type, int *nitems)
- 
-     ENTER;
-     prop_data = NULL;
--    if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, 0x7fffffff, False,
-+    if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0, G_MAXLONG, False,
-               type, &type_ret, &format_ret, &items_ret,
-               &after_ret, &prop_data) != Success)
-     {
-@@ -612,7 +612,7 @@ int
- get_net_number_of_desktops()
- {
-     int desknum;
--    guint32 *data;
-+    gulong *data;
- 
-     ENTER;
-     data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_NUMBER_OF_DESKTOPS,
-@@ -630,7 +630,7 @@ int
- get_net_current_desktop ()
- {
-     int desk;
--    guint32 *data;
-+    gulong *data;
- 
-     ENTER;
-     data = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_CURRENT_DESKTOP, XA_CARDINAL, 0);
-@@ -646,7 +646,7 @@ int
- get_net_wm_desktop(Window win)
- {
-     int desk = 0;
--    guint32 *data;
-+    gulong *data;
- 
-     ENTER;
-     data = get_xaproperty (win, a_NET_WM_DESKTOP, XA_CARDINAL, 0);
-@@ -661,7 +661,7 @@ GPid
- get_net_wm_pid(Window win)
- {
-     GPid pid = 0;
--    guint32 *data;
-+    gulong *data;
- 
-     ENTER;
-     data = get_xaproperty (win, a_NET_WM_PID, XA_CARDINAL, 0);
-diff --git a/src/panel.c b/src/panel.c
-index ee61197..b13a850 100644
---- a/src/panel.c
-+++ b/src/panel.c
-@@ -73,7 +73,7 @@ static void lxpanel_finalize(GObject *object)
-         lxpanel_config_save( self );
-     config_destroy(p->config);
- 
--    g_free(p->workarea);
-+    XFree(p->workarea);
-     g_free( p->background_file );
-     g_slist_free( p->system_menus );
- 
-@@ -380,7 +380,7 @@ void _panel_set_wm_strut(LXPanel *panel)
-         strut_size = p->height_when_hidden;
- 
-     /* Set up strut value in property format. */
--    guint32 desired_strut[12];
-+    gulong desired_strut[12];
-     memset(desired_strut, 0, sizeof(desired_strut));
-     if (p->setstrut)
-     {
-@@ -541,7 +541,7 @@ panel_event_filter(GdkXEvent *xevent, GdkEvent *event, gpointer not_used)
-             for( l = all_panels; l; l = l->next )
-             {
-                 LXPanel* p = (LXPanel*)l->data;
--                g_free( p->priv->workarea );
-+                XFree( p->priv->workarea );
-                 p->priv->workarea = get_xaproperty (GDK_ROOT_WINDOW(), a_NET_WORKAREA, XA_CARDINAL, &p->priv->wa_len);
-                 /* print_wmdata(p); */
-             }
-@@ -1225,7 +1225,7 @@ panel_start_gui(LXPanel *panel)
- {
-     Atom state[3];
-     XWMHints wmhints;
--    guint32 val;
-+    gulong val;
-     Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-     Panel *p = panel->priv;
-     GtkWidget *w = GTK_WIDGET(panel);
-@@ -1284,9 +1284,9 @@ panel_start_gui(LXPanel *panel)
-     _panel_establish_autohide(panel);
- 
-     /* send it to running wm */
--    Xclimsg(p->topxwin, a_NET_WM_DESKTOP, 0xFFFFFFFF, 0, 0, 0, 0);
-+    Xclimsg(p->topxwin, a_NET_WM_DESKTOP, G_MAXULONG, 0, 0, 0, 0);
-     /* and assign it ourself just for case when wm is not running */
--    val = 0xFFFFFFFF;
-+    val = G_MAXULONG;
-     XChangeProperty(xdisplay, p->topxwin, a_NET_WM_DESKTOP, XA_CARDINAL, 32,
-           PropModeReplace, (unsigned char *) &val, 1);
- 
-diff --git a/src/private.h b/src/private.h
-index 52f398d..fb909e3 100644
---- a/src/private.h
-+++ b/src/private.h
-@@ -113,7 +113,7 @@ struct _Panel {
- 
-     int desknum;
-     int curdesk;
--    guint32 *workarea;
-+    gulong *workarea;
-     int wa_len;
- 
-     char* background_file;
--- 
-2.1.1
-

Deleted: lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch
===================================================================
--- lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch	2014-11-15 05:02:44 UTC (rev 122591)
+++ lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch	2014-11-15 11:00:46 UTC (rev 122592)
@@ -1,30 +0,0 @@
-From f47c27ab5c5ee6086ff3a17e434ce677344a1a2c Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Fri, 3 Oct 2014 23:27:02 +0300
-Subject: [PATCH] [SF#680]Fix left click on "Move to Workspace" menu
-
-Since the menu popup is initiated by a mouse button release, we need to
-specify 0 for the button parameter in the call to gtk_menu_popup().
-
-This fixes left clicking on the "Move to Workspace" sub-menu, which
-previously would do nothing.
----
- plugins/launchtaskbar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c
-index fc8e464..d043933 100644
---- a/plugins/launchtaskbar.c
-+++ b/plugins/launchtaskbar.c
-@@ -2541,7 +2541,7 @@ static gboolean taskbar_task_control_event(GtkWidget * widget, GdkEventButton *
-                 GTK_MENU(tb->menu),
-                 NULL, NULL,
-                 (GtkMenuPositionFunc) taskbar_popup_set_position, (gpointer) visible_task,
--                event->button, event->time);
-+                0, event->time);
-         }
-     }
- 
--- 
-2.1.2
-


More information about the arch-commits mailing list