Accepting request 319663 from home:jcsl:test

Update to version 3.6.1

OBS-URL: https://build.opensuse.org/request/show/319663
OBS-URL: https://build.opensuse.org/package/show/X11:lxde/openbox?expand=0&rev=82

openbox-3.5-2-toggled_hover-toggled_pressed-bitmaps-ignored.patch

@@ -1,40 +0,0 @@
-From f1f5610cca8511be3bd03198f49a6a4e9fc15314 Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu@gmail.com>
-Date: Wed, 5 Nov 2014 10:52:22 +0100
-Subject: [PATCH] Remove wrong code from button mask loading code, bug 6065
-
-The READ_MASK_COPY macro already uses these exact fallbacks, so these
-lines just overwrote the custom bitmaps with the default fallback bitmaps.
----
- obrender/theme.c | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/obrender/theme.c b/obrender/theme.c
-index 87ca5c8..4ac4c5b 100644
---- a/obrender/theme.c
-+++ b/obrender/theme.c
-@@ -550,21 +550,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
-     theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH;
-     theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT;
- 
--    /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */
--    theme->btn_max->toggled_hover_mask =
--        RrPixmapMaskCopy(theme->btn_max->toggled_mask);
--    theme->btn_desk->toggled_hover_mask =
--        RrPixmapMaskCopy(theme->btn_desk->toggled_mask);
--    theme->btn_shade->toggled_hover_mask =
--        RrPixmapMaskCopy(theme->btn_shade->toggled_mask);
--    /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/
--    theme->btn_max->toggled_pressed_mask =
--        RrPixmapMaskCopy(theme->btn_max->toggled_mask);
--    theme->btn_desk->toggled_pressed_mask =
--        RrPixmapMaskCopy(theme->btn_desk->toggled_mask);
--    theme->btn_shade->toggled_pressed_mask =
--        RrPixmapMaskCopy(theme->btn_shade->toggled_mask);
--
-     /* read the decoration textures */
-     READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE);
-     READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title,
--- 
-1.9.1
-

openbox-3.5.2-return.patch

@@ -1,10 +0,0 @@
---- openbox/mouse.c.orig	2013-08-13 08:31:58.953981829 +0200
-+++ openbox/mouse.c	2013-08-13 08:32:18.822008902 +0200
-@@ -174,6 +174,7 @@
-     case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION;
-     default:
-         g_assert_not_reached();
-+        return OB_USER_ACTION_NONE;
-     }
- }
- 

openbox-3.5.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:128fb4ef11f83f6edb1685cfc04f44a16a5322082fc519f9d7cac84fc658af33
-size 972751

openbox-3.6.1-return.patch

@@ -0,0 +1,20 @@
+--- openbox-3.6.1/openbox/mouse.c	2014-11-05 16:19:42.000000000 +0100
++++ openbox-3.6.1-new/openbox/mouse.c	2015-07-30 21:50:01.170367292 +0200
+@@ -174,6 +174,7 @@
+     case OB_MOUSE_ACTION_MOTION: return OB_USER_ACTION_MOUSE_MOTION;
+     default:
+         g_assert_not_reached();
++		  return OB_USER_ACTION_NONE;
+     }
+ }
+ 
+--- openbox-3.6.1/openbox/actions/if.c	2014-11-05 16:19:42.000000000 +0100
++++ openbox-3.6.1-new/openbox/actions/if.c	2015-07-30 21:46:10.810359664 +0200
+@@ -168,6 +168,7 @@
+         return TRUE;
+     }
+     g_assert_not_reached();
++	 return OB_USER_ACTION_NONE;
+ }
+ 
+ static void setup_query(Options* o, xmlNodePtr node, QueryTarget target) {

openbox-3.6.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
+size 659056

openbox.changes

@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Thu Jul 30 19:26:15 UTC 2015 - trcs@gmx.com
+
+- update to 3.6.1:
+  * Bump ABI version of libobrender that should have been done in
+    3.6
+  * Added various new abilities to If action, including the <query>
+    tag, matching class, name, role and window type.
+  * Added ForEach action.
+  * Restore the <center> option for window placement.
+  * New GrowToFill action.
+  * Updated Portuguese and Polish translations.
+  * New Galician translation.
+  * Added strict option to ToggleShowDesktop action.
+  * Speed optimization in rendering code.
+  * New <position> tag for ShowMenu action allows placing menus
+    other than at the mouse cursor.
+  * Fix some corner cases of relative position to work correctly.
+  * Allow specifying multiple mousebinds in one tag as we already
+    do for keybinds (separated by spaces, as "W-Return M-S-F3" for
+    example).
+  * Added option rebindOnMappingNotify option, on by default, which
+    controls if we update binds when the keyboard layout changes at
+    runtime.
+  * The resize action now only considers the part of the client
+    that is onscreen for purposes of picking an action to perform.
+  * Make desktop actions non-interactive (means you can have more
+    actions bound to a key after them, and the dialog disappears on
+    a timer instead of when releasing the modifier keys).
+  * obxprop is now not pathologically slow when printing very long
+    arrays.
+  * Fix menu accelerator underlines sometimes not showing up.
+  * Fix so you can click menu entries before the menuHideDelay
+    expires if it's a new click.
+  * Don't readd the X event fd to the poll set every time we
+    reconfigure.
+  * Fix some specialized button bitmaps not loading from the
+    correct files. (toggled + pressed or hover would just be the
+    base toggled image).
+  * Various small bugfixes.
+- spec file clean-up
+  * removed unnecessary Requires: libxslt-tools
+  * removed unnecessary %clean section
+- Removed unnecessary patch:
+  * openbox-3.5-2-toggled_hover-toggled_pressed-bitmaps-ignored.patch
+- Removed openbox-3.5.2-return.patch
+- Added openbox-3.6.1-return.patch to fix a new 
+  no-return-in-nonvoid-function error in actions/if.c
+  * openbox-3.5.2-return.patch is included in this patch
+
 -------------------------------------------------------------------
 Fri Mar  6 14:38:59 UTC 2015 - trcs@gmx.com
 

openbox.spec

@@ -18,20 +18,19 @@
 
 Name:           openbox
 Provides:       windowmanager
-Version:        3.5.2
+Version:        3.6.1
 Release:        0
 Summary:        ICCCM and EWMH Compliant Window Manager with Very Few Dependencies
 License:        GPL-2.0+
 Group:          System/GUI/Other
 Url:            http://openbox.org/
-Source:         http://openbox.org/dist/openbox/openbox-%{version}.tar.gz
+Source:         http://openbox.org/dist/openbox/openbox-%{version}.tar.xz
 Source1:        %name-README.SuSE
 Source2:        %name.desktop
 Source3:        %name-pipemenu
 Source4:        menu.xml
 Source5:        xcompmgr-autostart
-Patch1:         %name-3.5.2-return.patch
-Patch2:         %name-3.5-2-toggled_hover-toggled_pressed-bitmaps-ignored.patch
+Patch1:         %name-3.6.1-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
@@ -56,7 +55,6 @@ BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  gnome-session-core
 BuildRequires:  libtool
 BuildRequires:  update-desktop-files
-Requires:       libxslt-tools
 Requires:       xdg-menu
 Recommends:     obconf
 
@@ -102,14 +100,13 @@ Development Includes and static libraries for openbox.
 %prep
 %setup -q
 cp %{S:1} ./README.SUSE
-%patch1
-%patch2 -p1
+%patch1 -p1
 mv po/no.po po/nb.po
 mv po/no.gmo po/nb.gmo
 %__perl -p -i -e 's/^no$/nb/' po/LINGUAS
 
 %build
-autoreconf -fiv
+#autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --disable-static --with-pic
 %__make clean
@@ -146,9 +143,6 @@ install -m 0755 %SOURCE5 $RPM_BUILD_ROOT/%_bindir/xcompmgr-autostart
 /sbin/ldconfig
 %desktop_database_postun
 
-%clean
-%{?buildroot:%__rm -rf '%{buildroot}'}
-
 %files -f %name.lang
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG COPYING COMPLIANCE README README.SUSE