Hello community, here is the log from the commit of package icewm.2683 for openSUSE:13.1:Update checked in at 2014-03-31 10:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/icewm.2683 (Old) and /work/SRC/openSUSE:13.1:Update/.icewm.2683.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm.2683" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:13.1:Update/.icewm.2683.new/icewm.changes 2014-03-31 10:57:51.000000000 +0200 @@ -0,0 +1,651 @@ +------------------------------------------------------------------- +Fri Mar 21 15:46:43 UTC 2014 - msrb@suse.com + +- icewm-fix-themes.patch + * Workaround for bnc#856931. + +------------------------------------------------------------------- +Thu Mar 28 08:59:08 UTC 2013 - mmeister@suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- +Tue May 22 10:25:52 UTC 2012 - idonmez@suse.com + +- Fix build with gcc 4.7 +- Fix build with new X11 headers + +------------------------------------------------------------------- +Tue Dec 20 20:49:49 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Aug 29 21:52:18 UTC 2011 - crrodriguez@opensuse.org + +- Must link with -lfontconfig too, fix build. + +------------------------------------------------------------------- +Tue Apr 26 11:02:56 UTC 2011 - mmarek@novell.com + +- Change the command to apply icewm-preferences.patch to make + automatic checks happy. + +------------------------------------------------------------------- +Mon Mar 21 10:58:16 UTC 2011 - mmarek@novell.com + +- Fix shutdown and reboot (bnc#681126). + +------------------------------------------------------------------- +Mon Mar 21 10:46:09 UTC 2011 - mmarek@novell.com + +- Update to 1.3.7: + * battery status as graphics not text (Alexander Drozdov) + * 'icewm-set-gnomewm' script to set GNOME window manager to icewm + * bugfixes + +------------------------------------------------------------------- +Wed Sep 8 03:06:27 CEST 2010 - vuntz@opensuse.org + +- Change old-style BuildRequires to pkgconfig() style + BuildRequires: + + old-style: gnome-desktop-devel, libgnomeui-devel. + + new-style: gdk-pixbuf-xlib-2.0, gnome-desktop-2.0, + libgnomeui-2.0. +- This will make it easier to switch to GNOME 3 libraries. + +------------------------------------------------------------------- +Tue Jan 26 16:10:38 CET 2010 - mmarek@suse.cz + +- fix applying of custom window options. + +------------------------------------------------------------------- +Tue Jan 26 13:39:57 CET 2010 - mmarek@suse.cz + +- update to 1.3.6 + * XRANDR support + * uses gdk-pixbuf instead of imlib + +------------------------------------------------------------------- +Mon Sep 7 16:08:32 CEST 2009 - mmarek@suse.cz + +- icewm-1.2.38pre1-bad-delete.patch: fix for bnc#525804 + +------------------------------------------------------------------- +Wed Apr 29 17:03:41 CEST 2009 - mmarek@suse.cz + +- updated to 1.2.38pre1 + * bugfixes + +------------------------------------------------------------------- +Mon Feb 23 00:16:09 CET 2009 - vuntz@novell.com + +- Add icewm-1.2.36-gnome-compilation.patch to fix build. The patch + should probably be sent upstream. +- Add libgnomeui-devel BuildRequires for the patch. + +------------------------------------------------------------------- +Fri Oct 24 23:29:21 CEST 2008 - mmarek@suse.de + +- updated to 1.2.36 final + * add option TaskBarFullscreenAutoShow (default = 1) + * fixes --with-line build + +------------------------------------------------------------------- +Mon Sep 29 16:08:25 CEST 2008 - mmarek@suse.cz + +- fixed unaligned access in XChangeProperly() + +------------------------------------------------------------------- +Thu Sep 11 12:15:06 CEST 2008 - mmarek@suse.cz + +- updated to 1.2.36pre2 + * add support for sysfs interface (instead of proc) for battery + status (initial code by Santiago Garcia Mantinan) + * bugfixes & translation updates + +------------------------------------------------------------------- +Fri Jul 18 17:49:35 CEST 2008 - mmarek@suse.cz + +- also fix session locking (use xscreensaver or xlock) (bnc#406156) + +------------------------------------------------------------------- +Fri Jul 18 17:10:36 CEST 2008 - mmarek@suse.cz + +- make shutdown and reboot work out of the box (bnc#406156) + +------------------------------------------------------------------- +Fri Mar 7 13:36:51 CET 2008 - mmarek@suse.cz + +- don't popup empty window menu + +------------------------------------------------------------------- +Fri Feb 29 11:27:23 CET 2008 - mmarek@suse.cz + +- fixed centering of dialogs (bnc#359529) + +------------------------------------------------------------------- +Tue Jan 29 14:34:44 CET 2008 - mmarek@suse.cz + +- make icewm --config=file work + (override-config.patch) + +------------------------------------------------------------------- +Mon Jan 28 10:23:43 CET 2008 - mmarek@suse.cz + +- updated to 1.2.35 + * Application tray bug fixes + * Add encoding/language to about dialog + * fix gmplayer switching to fullscreen + * popup dialog focus fixes + * fix screen change with xrandr 1.2 + * build fixes (Bert Wesarg) + * fix FocusOnRaise + * tray fixes + * fix taskbar popup in fullscreen mode +- don't install genpref (only needed at build time) +- fixed build for older distributions in X11:windowmanagers +- use %%suse_update_desktop_file + +------------------------------------------------------------------- +Mon Aug 13 11:43:13 CEST 2007 - mmarek@suse.cz + +- updated to 1.2.32 [#299583] + * auto-hide like taskbar activation in full screen mode added + * missing ShowSettingsMenu and ShowFocusModeMenu + settings (Evgenii Terechkov) + * binding to raise window with mouse + (MouseWinRaise=Ctrl+Alt+Mouse1) (Thomas Holder) + * translation updates (cs, ru, zh_CN, zh_TW) + * bugfixes +- link duplicate theme icons + +------------------------------------------------------------------- +Sat Mar 3 13:07:13 CET 2007 - aj@suse.de + +- /usr/share/xsessions/ is part of filesystems now. + +------------------------------------------------------------------- +Wed Jan 24 16:48:24 CET 2007 - mmarek@suse.cz + +- fixed strict aliasing warning + +------------------------------------------------------------------- +Fri Jan 12 09:35:23 CET 2007 - mmarek@suse.cz + +- fix last change (Start -> Help didn't work) + (icewm-docdir.patch) + +------------------------------------------------------------------- +Thu Jan 11 12:20:35 CET 2007 - mmarek@suse.cz + +- updated to 1.2.30 + + battery status cleanups + + new option BatteryPollingPeriod (default 10 seconds) + + moved Themes selection to Settings menu + + added Settings -> Focus menu (config saved to + ~/.icewm/focus_mode as FocusMode=1,2 or 0) + + new setting MapInactiveOnTop (default 1) + + new setting RequestFocusOnAppRaise (when FocusOnAppRaise=0) + + altgr_binding_support by Jörg Sommer + + Apple PMU support by Jörg Sommer + + start menu pixmap now named: taskbar/start.xpm + + try to mouse focus only when mouse actually moves to another + window + + prevent focusing taskbar with mouse focus + + use locale strings in 'icewm-menu-gnome2' ++++ 454 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.icewm.2683.new/icewm.changes New: ---- icewm-1.2.35-empty-winmenu.patch icewm-1.2.35-override-config.patch icewm-1.2.35-unaligned-access.patch icewm-1.3.6-winoptions.patch icewm-1.3.7.tar.gz icewm-docdir.patch icewm-fix-themes.patch icewm-gcc47.patch icewm-linking.patch icewm-menu.patch icewm-multiByte.patch icewm-preferences.patch icewm-x11.patch icewm.changes icewm.desktop icewm.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ # # spec file for package icewm # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: icewm BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: gnome-desktop-devel BuildRequires: libgnomeui-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: pkgconfig(libgnomeui-2.0) %if 0%{?suse_version} >= 1030 BuildRequires: fdupes %endif Provides: windowmanager Requires: desktop-data Requires: icewm-bin Requires: xdg-menu Version: 1.3.7 Release: 0 Source: http://downloads.sourceforge.net/project/%{name}/%{name}-1.3/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch1: icewm-multiByte.patch Patch2: icewm-menu.patch Patch3: icewm-docdir.patch Patch4: icewm-1.2.35-override-config.patch Patch5: icewm-1.2.35-empty-winmenu.patch Patch6: icewm-1.2.35-unaligned-access.patch Patch7: icewm-1.3.6-winoptions.patch Patch8: icewm-linking.patch Patch9: icewm-gcc47.patch Patch10: icewm-x11.patch Patch11: icewm-fix-themes.patch # applied in %%build Patch99: icewm-preferences.patch Url: http://www.icewm.org/ Summary: Window Manager with a Taskbar License: LGPL-2.1+ Group: System/GUI/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A window manager for the X Window System that can emulate the look of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to take the best features from those systems. IceWM features multiple workspaces, opaque move and resize, a taskbar, a window list, mailbox status, and a digital clock. It is fast and small. Authors: -------- Marko Macek <Marko.Macek@gmx.net> %package default Summary: Window Manager with a Taskbar--Default Version Group: System/GUI/Other Provides: icewm-bin Requires: icewm Conflicts: icewm-lite %description default A window manager for the X Window System that can emulate the look of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to take the best features from those systems. IceWM features multiple workspaces, opaque move and resize, a taskbar, a window list, mailbox status, and a digital clock. It is fast and small. Authors: -------- Marko Macek <Marko.Macek@gmx.net> %package gnome Summary: Windowmanager with Taskbar - gnome version Group: System/GUI/GNOME Requires: icewm-default %description gnome Window Manager for X Window System. Can emulate the look of Windows 95, OS/2 Warp 3,4, Motif. Tries to take the best features of the above systems. Features multiple workspaces, opaque move and resize, task bar, window list, mailbox status, digital clock. Fast and small. This package adds GNOME menu and sound support to icewm. Authors: -------- Marko Macek <Marko.Macek@gmx.net> %prep %setup -q %patch1 %patch2 %patch3 %patch4 %patch5 %patch6 %patch7 -p1 %patch8 %patch9 -p1 %patch10 -p1 %patch11 -p1 %build autoconf export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" # needed for 10.[12] builds in the bs export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig ./configure --disable-silent-rules --without-debug \ --sysconfdir=/etc \ --with-cfgdir=/etc/icewm \ --prefix=/usr \ --with-docdir=%{_docdir} \ --enable-i18n \ --enable-nls \ --enable-corefonts \ --enable-guievents \ --enable-antialiasing \ --enable-gradients \ --enable-shaped-decorations \ --with-icesound=oss,esd \ --with-imlib \ --enable-menus-gnome2 make %{?jobs:-j%jobs} V=1 # patch generated lib/preferences file patch -p0 -i %{P:99} %install make DESTDIR=$RPM_BUILD_ROOT install install-docs mkdir -p $RPM_BUILD_ROOT/etc/icewm for cfgfile in keys menu preferences toolbar winoptions ; do mv $RPM_BUILD_ROOT/usr/share/icewm/$cfgfile \ $RPM_BUILD_ROOT/etc/icewm done %{find_lang} icewm ln -s icewm.html $RPM_BUILD_ROOT/%{_docdir}/icewm/index.html # install the xsession desktop file mkdir -p $RPM_BUILD_ROOT/usr/share/xsessions cp -f %{SOURCE1} $RPM_BUILD_ROOT/usr/share/xsessions %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/icewm.desktop # link duplicate theme icons to save some space %{?fdupes:%fdupes %buildroot/usr/share/icewm/themes/} %clean rm -rf $RPM_BUILD_ROOT; %files -f icewm.lang %defattr(-,root,root) %doc %{_docdir}/icewm %dir /etc/icewm %config /etc/icewm/* /usr/share/icewm/ /usr/share/xsessions/* %files default %defattr(-,root,root) /usr/bin/icewm /usr/bin/icewmhint /usr/bin/icewmbg /usr/bin/icehelp /usr/bin/icesh /usr/bin/icewmtray /usr/bin/icewm-session %files gnome %defattr(-,root,root) /usr/bin/icesound /usr/bin/icewm-menu-gnome2 /usr/bin/icewm-set-gnomewm %changelog ++++++ icewm-1.2.35-empty-winmenu.patch ++++++ Should be fixed in YMenu / YPopupWindow for all menus, but we need it now for the window menu (to disable it in the installation icewm) --- src/wmframe.cc | 2 ++ 1 file changed, 2 insertions(+) Index: src/wmframe.cc =================================================================== --- src/wmframe.cc.orig +++ src/wmframe.cc @@ -2017,6 +2017,8 @@ void YFrameWindow::popupSystemMenu(YWind { if (fPopupActive == 0) { updateMenu(); + if (windowMenu()->itemCount() == 0) + return; if (windowMenu()->popup(owner, forWindow, this, x, y, flags)) fPopupActive = windowMenu(); ++++++ icewm-1.2.35-override-config.patch ++++++ make icewm --config=preferences.xy work, i.e. load /etc/icewm/preferences.xy --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: src/wmapp.cc =================================================================== --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -1142,7 +1142,7 @@ YWMApp::YWMApp(int *argc, char ***argv, managerWindow = None; #ifndef NO_CONFIGURE - loadConfiguration("preferences"); + loadConfiguration(configFile ? configFile : "preferences"); if (themeName != 0) { MSG(("themeName=%s", themeName)); ++++++ icewm-1.2.35-unaligned-access.patch ++++++ --- src/wmapp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- src/wmapp.cc.orig +++ src/wmapp.cc @@ -218,7 +218,7 @@ static void registerProtocols2(Window xi PropModeReplace, (unsigned char *)win_proto, i); #endif - pid_t pid = getpid(); + XID pid = getpid(); const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; #ifdef GNOME1_HINTS ++++++ icewm-1.3.6-winoptions.patch ++++++ --- src/wmframe.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- icewm-1.3.6.orig/src/wmframe.cc +++ icewm-1.3.6/src/wmframe.cc @@ -2264,15 +2264,15 @@ void YFrameWindow::getWindowOptions(Wind if (name != null) { ustring klass_instance = name.append(".").append(klass); list->mergeWindowOption(opt, klass_instance, remove); - } else - list->mergeWindowOption(opt, klass, remove); + } + list->mergeWindowOption(opt, klass, remove); } if (name != null) { if (role != null) { ustring name_role = name.append(".").append(role); list->mergeWindowOption(opt, name_role, remove); - } else - list->mergeWindowOption(opt, name, remove); + } + list->mergeWindowOption(opt, name, remove); } if (role != null) list->mergeWindowOption(opt, role, remove); ++++++ icewm-docdir.patch ++++++ --- Makefile.in | 10 +++++----- src/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- Makefile.in.orig +++ Makefile.in @@ -116,12 +116,12 @@ install-base: base install-docs: docs @echo ------------------------------------------ - @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" + @rm -fr "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm" @echo "Installing documentation in $(DESTDIR)$(DOCDIR)" - @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" - @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)" + @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm" + @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm" @echo ------------------------------------------ install-nls: nls --- src/Makefile.in.orig +++ src/Makefile.in @@ -32,7 +32,7 @@ DEFS = @DEFS@ \ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ -DICESMEXE='"icewm-session$(EXEEXT)"' \ -DICEHELPEXE='"icehelp$(EXEEXT)"' \ - -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' + -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` ++++++ icewm-fix-themes.patch ++++++ 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", ++++++ icewm-gcc47.patch ++++++ Index: icewm-1.3.7/src/yarray.h =================================================================== --- icewm-1.3.7.orig/src/yarray.h +++ icewm-1.3.7/src/yarray.h @@ -152,7 +152,7 @@ public: } virtual void remove(const typename YArray<DataType *>::SizeType index) { - if (index < YArray<DataType *>::getCount()) delete getItem(index); + if (index < YArray<DataType *>::getCount()) delete this->getItem(index); YArray<DataType *>::remove(index); } ++++++ icewm-linking.patch ++++++ --- src/Makefile.in.orig +++ src/Makefile.in @@ -37,9 +37,9 @@ DEFS = @DEFS@ \ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` LFLAGS = @LDFLAGS@ -LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` +LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -CORE_LIBS = @CORE_LIBS@ # `fc-config --libs` +CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs` IMAGE_LIBS = @IMAGE_LIBS@ AUDIO_LIBS = @AUDIO_LIBS@ GNOME1_LIBS = @GNOME1_LIBS@ @@ -207,29 +207,29 @@ clean: %.o: %.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) $(GCCDEP) -c $< $(BINARIES): @echo " LD " $@ - @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS) + $(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS) genpref.o: genpref.cc @echo " HOSTCXX " $@ - @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< + $(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< genpref$(EXEEXT): @echo " HOSTLD " $@ - @$(HOSTLD) -o $@ $(genpref_OBJS) + $(HOSTLD) -o $@ $(genpref_OBJS) ################################################################################ gnome.o: gnome.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< gnome2.o: gnome2.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $< + $(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $< ################################################################################ ++++++ icewm-menu.patch ++++++ --- lib/menu.in 2003-09-27 09:54:45.000000000 +0200 +++ lib/menu.in 2004-03-11 22:59:14.000000000 +0100 @@ -5,6 +5,8 @@ # (re)install icewm. # prog xterm xterm xterm +prog mlterm xterm mlterm +prog xiterm xterm xiterm prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 prog fte fte fte prog NEdit nedit nedit @@ -12,8 +14,4 @@ prog XChat xchat xchat prog Gimp gimp gimp separator -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs -menufile Tool_bar folder toolbar +menuprog SUSE folder xdg_menu --format icewm ++++++ icewm-multiByte.patch ++++++ Index: src/ylocale.cc =================================================================== --- src/ylocale.cc.orig +++ src/ylocale.cc @@ -47,8 +47,7 @@ YLocale::YLocale(char const * localeName "Falling back to 'C' locale'.")); fLocaleName = setlocale(LC_ALL, "C"); } -#warning "P1 should always use multibyte/fontset if I18N" - multiByte = (MB_CUR_MAX > 1); + multiByte = true; char const * codeset = NULL; int const codesetItems[] = { CONFIG_NL_CODESETS }; ++++++ icewm-preferences.patch ++++++ Tweak default icewm preferences Attention: this patch is applied in the %build phase, because it patches a file generated by ./src/genpref. To edit the patch: quilt setup icewm.spec cd icewm-<version> quilt push -a ./configure <options from the spec> make -C src genpref ./src/genpref >lib/preferences quilt import -p0 patches/icewm-preferences.patch quilt push vi lib/preferences quilt refresh --- lib/preferences | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- lib/preferences.orig +++ lib/preferences @@ -509,7 +509,7 @@ # NewMailCommand="" # Command to lock display/screensaver -# LockCommand="" +LockCommand="xscreensaver-command -lock || xlock -mousemotion" # Command to run on clock # ClockCommand="xclock -name icewm -title Clock" @@ -533,10 +533,10 @@ # LogoutCancelCommand="" # Command to shutdown the system -# ShutdownCommand="" +ShutdownCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop" # Command to reboot the system -# RebootCommand="" +RebootCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart" # Command to run on CPU status # CPUStatusCommand="xterm -name top -title Process\ Status -e top" @@ -1280,19 +1280,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4 # # Display desktop background centered and not tiled -# DesktopBackgroundCenter=0 # 0/1 +DesktopBackgroundCenter=1 # 0/1 # Support for semitransparent terminals like Eterm or gnome-terminal # SupportSemitransparency=1 # 0/1 # Desktop background scaled to full screen -# DesktopBackgroundScaled=0 # 0/1 +DesktopBackgroundScaled=1 # 0/1 # Desktop background color # DesktopBackgroundColor="rgb:00/20/40" # Desktop background image -# DesktopBackgroundImage="" +DesktopBackgroundImage="/usr/share/wallpapers/default-1600x1200.jpg" # Color to announce for semi-transparent windows # DesktopTransparencyColor="" ++++++ icewm-x11.patch ++++++ Description: Don't use "deprecated" as identifier, will FTBFS if another library defines functions as deprecated. Author: Andreas Moog <amoog@ubuntu.com> Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=10... Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 Forwarded: Yes --- icewm-1.3.7.orig/src/base.h +++ icewm-1.3.7/src/base.h @@ -2,9 +2,9 @@ #define __BASE_H #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 -#define deprecated __attribute__((deprecated)) +#define ICEWM_deprecated __attribute__((deprecated)) #else -#define deprecated +#define ICEWM_deprecated #endif /*** Atomar Data Types ********************************************************/ ++++++ icewm.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Type=XSession Exec=icewm-session TryExec=icewm-session Name=IceWM Name[af]=Icewm Name[eo]=GlaciFA Name[hi]=आइस-डबल्यूएम Name[lo]=ຕົວຈັດການຫນ້າຕ່າງ IceWM Name[sv]=Ice WM Name[th]=ตัวจัดการหน้าต่าง IceWM Name[xx]=xxIceWMxx Comment=A Windows 95-OS/2-Motif-like window manager Comment[ar]=مدير نوافذ مشابه لـ Win95-OS/2-Motif Comment[be]=Кіраваньне вокнамі падобнае на Windows 95-OS/2-Motif Comment[bn]=Windows 95-OS/2-Motif-এর অনুরূপ একটি উইণ্ডো ম্যানেজার Comment[bs]=Window manager nalik na Windows 95-OS/2-Motif Comment[ca]=Un gestor de finestres com els de Windows 95-OS/2-Motif Comment[cs]=Správce oken podobný Windows 95-OS/2-Motif Comment[cy]=Trefnydd ffenestri sy'n debyg i Windows95-OS/2-Motif Comment[da]=En Windows 95-OS/2-Motif-lignende vindueshåndtering Comment[de]=Fenstermanager im Stil von Windows 95, OS/2 und Motif Comment[el]=Ένας διαχειριστής παραθύρων παρόμοιος με τα Windows 95-OS/2-Motif Comment[eo]=Fenestroadministrilo kiel Vindozo 95, OS/2 kaj Motifo Comment[es]=Un administrador de ventanas similar a Win95-OS/2-Motif Comment[et]=Aknahaldur, mis näeb välja nagu Windows 95-OS/2-Motif Comment[eu]=Windows 95 OS/2 Motif-en itxura duen leiho kudeatzailea Comment[fi]=Windows 95:n ja OS/2-Motifin tyylinen ikkunaohjelma Comment[fr]=Un gestionnaire de fenêtres ressemblant à Windows 95-OS/2-Motif Comment[fy]=In Win95-OS/2-Motif-likens finstersmanager Comment[gl]=Un xestor de fiestras coma o de Windows 95-OS/2-Motif Comment[he]=מנהל חלונות מבוסס Motif הדומה במראהו לחלונות 95/OS-2 Comment[hi]=विंडोज़ 95-ओएस/2-मोटिफ जैसा विंडो प्रबंधक Comment[hr]=Upravitelj prozora nalik na Windows 95/OS/2/Motif Comment[hu]=Win95-OS/2-Motif-szerű ablakkezelő Comment[is]=Gluggastjóri sem líkist 95-OS/2-Motif Comment[it]=Un window manager in stile Windows 95-OS/2-Motif Comment[ja]=Windows95,OS/2,Motifに似たウィンドウマネージャ Comment[lt]=A Windows 95-OS/2-Motif-primenanti langų tvarkyklė Comment[lv]=Windows 95 - OS/2 - Motif līdzīgs logu menedžeris Comment[mk]=Менаџер на прозорци со изглед на Windows 95, OS/2 и Motif Comment[mn]=Виндовс 95-OS/2-Motif-шиг цонхны удирдагч Comment[mt]=Window manager jixbaħ lill-Windows 95-OS/2-Motif Comment[nb]=En vindusbehandler som likner Windows 95-OS/2-Motif Comment[nds]=Finsterpleger, de utsüht as Windows 95-OS/2-Motif Comment[nl]=Een Win95-OS/2-Motif-achtige windowmanager Comment[nn]=Ein vindaugssjef som liknar Windows 95-OS/2-Motif Comment[pa]=ਇੱਕ ਵਿੰਡੋ 95-OS/2-Motif-ਵਰਗਾ ਝਰੋਖਾ ਮੈਨੇਜਰ Comment[pl]=Menedżer okien podobny do Windows 95-OS/2-Motif Comment[pt]=Um gestor de janelas parecido com o Windows 95, OS/2 e Motif Comment[pt_BR]=Um gerenciador de janelas parecido com Windows 95-OS/2-Motif Comment[ro]=Un manager de ferestre cu aspect de Windows 95, OS/2 sau Motif Comment[ru]=Оконный менеджер в стиле Windows95-OS/2-Motif Comment[se]=Windows 95-OS/2-Motif-lágan lásegieđahalli Comment[sk]=Správca okien podobný Windows 95-OS/2-Motif Comment[sl]=Okenski upravitelj, podoben Windows 95, OS/2 in Motifu Comment[sr]=Менаџер прозора налик на Windows 95/OS/2/Motif Comment[sr@Latn]=Menadžer prozora nalik na Windows 95/OS/2/Motif Comment[sv]=Fönsterhanterare som liknar Windows 95-OS/2-Motif Comment[ta]=சாளரங்கள் 95-OS/2-மாடிஃப்-லைக் சாளர மேலாளர் Comment[tg]=Windows 95-OS/2-Motif-монанди мудири тиреза Comment[tr]=Windows 95-OS/2-Motif benzeri bir pencere yöneticisi Comment[uk]=Менеджер вікон наподіб Windows 95-OS/2-Motif Comment[uz]=Win95-OS/2-Motif'га ўхшаш ойна бошқарувчи Comment[vi]=Trình quản lý cửa sổ với mô típ kiểu Windows 95 Comment[wa]=On manaedjeu di purneas rishonnant Windows95-OS/2-Motif Comment[xx]=xxA Windows 95-OS/2-Motif-like window managerxx Comment[zh_CN]=类似 Windows-OS/2-Motif 的窗口管理器 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org