Hello community, here is the log from the commit of package icewm for openSUSE:Factory checked in at 2014-03-01 14:38:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icewm (Old) and /work/SRC/openSUSE:Factory/.icewm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icewm" Changes: -------- --- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2014-01-08 20:06:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2014-03-01 14:38:11.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 22 09:34:36 UTC 2014 - [email protected] + +- update version to 1.3.8 +- remove patches:icewm-gcc47.patch,icewm-x11.patch +- add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch + for new fate #313170 + +------------------------------------------------------------------- Old: ---- icewm-1.3.7.tar.gz icewm-gcc47.patch icewm-x11.patch New: ---- icewm-1.3.8-enable-guievents.patch icewm-1.3.8.tar.gz icewm-susemenu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -41,7 +41,7 @@ Requires: xdg-menu # if you have the choice, prefer the big one Recommends: icewm-default -Version: 1.3.7 +Version: 1.3.8 Release: 0 Source: http://downloads.sourceforge.net/project/%{name}/%{name}-1.3/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.desktop @@ -53,8 +53,8 @@ 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 +Patch9: icewm-1.3.8-enable-guievents.patch +Patch10: icewm-susemenu.patch # applied in %%build Patch99: icewm-preferences.patch Url: http://www.icewm.org/ @@ -121,7 +121,7 @@ %patch6 %patch7 -p1 %patch8 -%patch9 -p1 +%patch9 %patch10 -p1 %define lites icewm icewmhint icewmbg icesh icewm-session ++++++ icewm-1.2.35-override-config.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,18 +1,13 @@ -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 +diff --git src/wmapp.cc src/wmapp.cc +index d8b0032..24fb665 100644 +--- src/wmapp.cc +++ src/wmapp.cc -@@ -1142,7 +1142,7 @@ YWMApp::YWMApp(int *argc, char ***argv, +@@ -1178,7 +1178,7 @@ YWMApp::YWMApp(int *argc, char ***argv, const char *displayName): managerWindow = None; #ifndef NO_CONFIGURE -- loadConfiguration("preferences"); -+ loadConfiguration(configFile ? configFile : "preferences"); +- loadConfiguration(this, "preferences"); ++ loadConfiguration(this, configFile ? configFile : "preferences"); if (themeName != 0) { MSG(("themeName=%s", themeName)); ++++++ icewm-1.2.35-unaligned-access.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,14 +1,12 @@ ---- - src/wmapp.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- src/wmapp.cc.orig +diff --git src/wmapp.cc src/wmapp.cc +index d8b0032..6a5663d 100644 +--- src/wmapp.cc +++ src/wmapp.cc -@@ -218,7 +218,7 @@ static void registerProtocols2(Window xi +@@ -220,7 +220,7 @@ static void registerProtocols2(Window xid) { PropModeReplace, (unsigned char *)win_proto, i); #endif -- pid_t pid = getpid(); +- long pid = getpid(); + XID pid = getpid(); const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; ++++++ icewm-1.3.8-enable-guievents.patch ++++++ diff --git src/wmapp.h src/wmapp.h index 101992c..cbe2556 100644 --- src/wmapp.h +++ src/wmapp.h @@ -78,7 +78,7 @@ private: Window managerWindow; }; -#if 0 +#ifdef CONFIG_GUIEVENTS extern YWMApp * wmapp; #endif ++++++ icewm-1.3.7.tar.gz -> icewm-1.3.8.tar.gz ++++++ ++++ 7605 lines of diff (skipped) ++++++ icewm-docdir.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,11 +1,8 @@ ---- - Makefile.in | 10 +++++----- - src/Makefile.in | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- Makefile.in.orig +diff --git Makefile.in Makefile.in +index 92f76aa..54a67aa 100644 +--- Makefile.in +++ Makefile.in -@@ -116,12 +116,12 @@ install-base: base +@@ -119,12 +119,12 @@ install-base: base install-docs: docs @echo ------------------------------------------ @@ -23,7 +20,9 @@ @echo ------------------------------------------ install-nls: nls ---- src/Makefile.in.orig +diff --git src/Makefile.in src/Makefile.in +index 73f015b..46aea83 100644 +--- src/Makefile.in +++ src/Makefile.in @@ -32,7 +32,7 @@ DEFS = @DEFS@ \ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ @@ -33,4 +32,4 @@ + -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` + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags` ++++++ icewm-linking.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,18 +1,8 @@ ---- src/Makefile.in.orig +diff --git src/Makefile.in src/Makefile.in +index 73f015b..3f328f9 100644 +--- src/Makefile.in +++ 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: +@@ -203,25 +203,25 @@ clean: %.o: %.cc @echo " CXX " $@ @@ -36,11 +26,6 @@ ################################################################################ - 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 $< ++++++ icewm-menu.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,19 +1,9 @@ ---- 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 @@ +--- lib/menu.in.orig 2014-01-06 17:58:41.735307153 +0800 ++++ lib/menu.in 2014-01-06 18:00:17.594661556 +0800 +@@ -12,7 +12,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 ++++++ icewm-susemenu.patch ++++++ diff --git a/src/wmprog.cc b/src/wmprog.cc index 608608f..1d129a3 100644 --- a/src/wmprog.cc +++ b/src/wmprog.cc @@ -249,6 +249,14 @@ char *parseIncludeStatement(IApp *app, YSMListener *smActionListener, YActionLis return p; } +void loadMenusProg( + IApp *app, + YSMListener *smActionListener, + YActionListener *wmActionListener, + const char *command, + char *const argv[], + ObjectContainer *container); + char *parseMenus(IApp *app, YSMListener *smActionListener, YActionListener *wmActionListener, char *data, ObjectContainer *container) { char *p = data; char word[32]; @@ -415,6 +423,22 @@ char *parseMenus(IApp *app, YSMListener *smActionListener, YActionListener *wmAc delete[] name; delete[] icons; delete[] command; + } else if (!strcmp(word, "suseprog")) { + char *command; + YStringArray args; + + p = getCommandArgs(p, &command, args); + if (p == 0) { + msg(_("Error at prog %s"), "susemenu"); return p; + } + + MSG(("suseprog %s", command)); + + upath fullPath = findPath(getenv("PATH"), X_OK, command); + if (fullPath != null) { + loadMenusProg(app,smActionListener,wmActionListener,command,args.getCArray(),container); + } + delete[] command; } else if (!strcmp(word, "menuprogreload")) { char *name; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
