From 3fbd74b7d7e3f19d801927e82d31666057d33b5e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Jun 25 2015 15:39:56 +0000 Subject: restore libobrender compatibility (#1231693) --- diff --git a/openbox-abifix.patch b/openbox-abifix.patch new file mode 100644 index 0000000..1ae4f91 --- /dev/null +++ b/openbox-abifix.patch @@ -0,0 +1,12 @@ +diff -up openbox-3.6/obrender/theme.h.abifix openbox-3.6/obrender/theme.h +--- openbox-3.6/obrender/theme.h.abifix 2015-01-12 20:48:27.000000000 +0100 ++++ openbox-3.6/obrender/theme.h 2015-06-25 17:28:43.401411179 +0200 +@@ -114,6 +114,8 @@ struct _RrTheme { + RrColor *osd_pressed_lineart; + RrColor *osd_focused_lineart; + RrColor *menu_title_shadow_color; ++ /* padding to make libobrender compatible with openbox-3.5.2 */ ++ void *_pad[8]; + RrColor *menu_text_shadow_color; + + /* style settings - pics */ diff --git a/openbox.spec b/openbox.spec index d498b7b..9b2bfc9 100644 --- a/openbox.spec +++ b/openbox.spec @@ -12,6 +12,9 @@ Source2: xdg-menu Source3: menu.xml Source4: terminals.menu +# restore libobrender compatibility, remove when soname is bumped! +Patch1: openbox-abifix.patch + Requires: %{name}-libs%{?_isa} = %{version}-%{release} # required by xdg-menu and xdg-autostart scripts @@ -92,6 +95,7 @@ KDE session. %prep %setup -q +%patch1 -p1 -b .abifix %build