pool/icewm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229651 from X11:windowmanagers

Browse Source 
- icewm-bg-default-at-error.patch:
  properly default to the solid color background when the given
  default background pixmap can't be loaded (bnc#872740)

- icewm-fix-themes.patch
  * Workaround for bnc#856931. (forwarded request 229644 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/229651
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=40
This commit is contained in:
Stephan Kulow 2014-04-14 04:43:18 +00:00 committed by Git OBS Bridge
commit 5c8a0ce77c
4 changed files with 157 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icewm-bg-default-at-error.patch Normal file
View File

@ -0,0 +1,18 @@
---
src/icewmbg.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/src/icewmbg.cc
+++ b/src/icewmbg.cc
@@ -274,7 +274,10 @@ void DesktopBackgroundManager::changeBac
currentBackground = back;
handleBackground = true;
}
- } else if (DesktopBackgroundColor && DesktopBackgroundColor[0]) {
+ }
+
+ if (!handleBackground &&
+ DesktopBackgroundColor && DesktopBackgroundColor[0]) {
XSetWindowBackgroundPixmap(xapp->display(), desktop->handle(), 0);
XSetWindowBackground(xapp->display(), desktop->handle(), bPixel);
handleBackground = true;

122
icewm-fix-themes.patch Normal file
View File

@ -0,0 +1,122 @@
This is workaround for bnc#856931.
The "None" color is not used and causes the title to be invisible due to bug in Xserver/libgdk.
diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleAB.xpm icewm-1.3.8/lib/themes/icedesert/titleAB.xpm
--- icewm-1.3.8.orig/lib/themes/icedesert/titleAB.xpm 2014-03-03 14:04:45.087165548 +0200
+++ icewm-1.3.8/lib/themes/icedesert/titleAB.xpm 2014-03-03 14:05:27.926953675 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAB_xpm[] = {
-"1 20 20 1",
-" c None",
+"1 20 19 1",
". c #FFFFFF",
"+ c #FDFBFA",
"@ c #FBF8F5",
diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleAT.xpm icewm-1.3.8/lib/themes/icedesert/titleAT.xpm
--- icewm-1.3.8.orig/lib/themes/icedesert/titleAT.xpm 2014-03-03 14:04:45.086165483 +0200
+++ icewm-1.3.8/lib/themes/icedesert/titleAT.xpm 2014-03-03 14:05:36.371503268 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAT_xpm[] = {
-"1 20 20 1",
-" c None",
+"1 20 19 1",
". c #FFFFFF",
"+ c #FDFBFA",
"@ c #FBF8F5",
diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleIB.xpm icewm-1.3.8/lib/themes/icedesert/titleIB.xpm
--- icewm-1.3.8.orig/lib/themes/icedesert/titleIB.xpm 2014-03-03 14:04:45.086165483 +0200
+++ icewm-1.3.8/lib/themes/icedesert/titleIB.xpm 2014-03-03 14:05:44.591038217 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleIB_xpm[] = {
-"1 20 20 1",
-" c None",
+"1 20 19 1",
". c #FFFFFF",
"+ c #FBFBFB",
"@ c #F8F8F8",
diff -ur icewm-1.3.8.orig/lib/themes/icedesert/titleIT.xpm icewm-1.3.8/lib/themes/icedesert/titleIT.xpm
--- icewm-1.3.8.orig/lib/themes/icedesert/titleIT.xpm 2014-03-03 14:04:45.086165483 +0200
+++ icewm-1.3.8/lib/themes/icedesert/titleIT.xpm 2014-03-03 14:05:54.318671317 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleIT_xpm[] = {
-"1 20 20 1",
-" c None",
+"1 20 19 1",
". c #FFFFFF",
"+ c #FBFBFB",
"@ c #F8F8F8",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAB.xpm icewm-1.3.8/lib/themes/Infadel2/titleAB.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleAB.xpm 2014-03-03 14:04:45.089165678 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleAB.xpm 2014-03-03 14:06:37.815502206 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAS_xpm[] = {
-"1 17 12 1",
-" c None",
+"1 17 11 1",
". c #868687",
"+ c #9A9A9B",
"@ c #AEAEAF",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAS.xpm icewm-1.3.8/lib/themes/Infadel2/titleAS.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleAS.xpm 2014-03-03 14:04:45.089165678 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleAS.xpm 2014-03-03 14:06:43.555875804 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAS_xpm[] = {
-"1 17 12 1",
-" c None",
+"1 17 11 1",
". c #868687",
"+ c #9A9A9B",
"@ c #AEAEAF",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleAT.xpm icewm-1.3.8/lib/themes/Infadel2/titleAT.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleAT.xpm 2014-03-03 14:04:45.088165613 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleAT.xpm 2014-03-03 14:06:50.628336098 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAT_xpm[] = {
-"1 17 18 1",
-" c None",
+"1 17 17 1",
". c #868687",
"+ c #484848",
"@ c #344066",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIB.xpm icewm-1.3.8/lib/themes/Infadel2/titleIB.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleIB.xpm 2014-03-03 14:04:45.089165678 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleIB.xpm 2014-03-03 14:06:56.526719980 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAS_xpm[] = {
-"1 17 12 1",
-" c None",
+"1 17 11 1",
". c #868687",
"+ c #9A9A9B",
"@ c #AEAEAF",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIS.xpm icewm-1.3.8/lib/themes/Infadel2/titleIS.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleIS.xpm 2014-03-03 14:04:45.089165678 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleIS.xpm 2014-03-03 14:07:03.445170251 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleAS_xpm[] = {
-"1 17 12 1",
-" c None",
+"1 17 11 1",
". c #868687",
"+ c #9A9A9B",
"@ c #AEAEAF",
diff -ur icewm-1.3.8.orig/lib/themes/Infadel2/titleIT.xpm icewm-1.3.8/lib/themes/Infadel2/titleIT.xpm
--- icewm-1.3.8.orig/lib/themes/Infadel2/titleIT.xpm 2014-03-03 14:04:45.089165678 +0200
+++ icewm-1.3.8/lib/themes/Infadel2/titleIT.xpm 2014-03-03 14:07:09.963594488 +0200
@@ -1,7 +1,6 @@
/* XPM */
static char * titleIT_xpm[] = {
-"1 17 18 1",
-" c None",
+"1 17 17 1",
". c #868686",
"+ c #484848",
"@ c #4D4D4D",

13
icewm.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Apr 10 16:10:32 CEST 2014 - tiwai@suse.de
- icewm-bg-default-at-error.patch:
properly default to the solid color background when the given
default background pixmap can't be loaded (bnc#872740)
-------------------------------------------------------------------
Mon Mar 3 12:09:58 UTC 2014 - msrb@suse.com
- icewm-fix-themes.patch
* Workaround for bnc#856931.
-------------------------------------------------------------------
Wed Jan 22 09:34:36 UTC 2014 - tyang@suse.com

4
icewm.spec
View File

@ -55,6 +55,8 @@ Patch7: icewm-1.3.6-winoptions.patch
Patch8: icewm-linking.patch
Patch9: icewm-1.3.8-enable-guievents.patch
Patch10: icewm-susemenu.patch
Patch11: icewm-fix-themes.patch
Patch12: icewm-bg-default-at-error.patch
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
@ -123,6 +125,8 @@ This package adds GNOME menu and sound support to icewm.
%patch8
%patch9
%patch10 -p1
%patch11 -p1
%patch12 -p1
%define lites icewm icewmhint icewmbg icesh icewm-session