Hello community,
here is the log from the commit of package icewm for openSUSE:Factory checked
in at 2016-03-16 10:25:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-02-25
21:53:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2016-03-16
10:25:34.000000000 +0100
@@ -1,0 +2,21 @@
+Mon Mar 14 10:29:06 UTC 2016 - tchva...@suse.com
+
+- Disable image centering, with scaling now working it keeps aspect
+ ration with centering enabled:
+ * icewm-preferences.patch
+
+-------------------------------------------------------------------
+Tue Mar 8 12:49:38 UTC 2016 - tchva...@suse.com
+
+- Update prefferences patch to point to correct wallpaper on the disk
+ based on openSUSE/SLE branding package
+
+-------------------------------------------------------------------
+Tue Mar 8 12:25:59 UTC 2016 - tchva...@suse.com
+
+- Add back icewm menu as it is used by us
+ * icewm-susemenu.patch
+- Add patch to fix icewm session desktop files
+ * icewm-session-desktop.patch
+
+-------------------------------------------------------------------
@@ -168,0 +190,14 @@
+
+-------------------------------------------------------------------
+Mon Sep 22 15:24:50 UTC 2014 - fcro...@suse.com
+
+- Update icewm-preferences.patch with new location of SUSE
+ background file.
+- Ensure icewm-theme-branding is recommended.
+
+-------------------------------------------------------------------
+Tue May 27 07:29:34 UTC 2014 - ty...@suse.com
+
+- add icewm-1.3.8-shutdown-reboot-command.patch:
+ fix the upstream bug of invalid shutdown/reboot command
+ change the shutdown/reboot command in preference (bnc#872988)
New:
----
icewm-session-desktop.patch
icewm-susemenu.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.euLWTo/_old 2016-03-16 10:25:35.000000000 +0100
+++ /var/tmp/diff_new_pack.euLWTo/_new 2016-03-16 10:25:35.000000000 +0100
@@ -28,6 +28,10 @@
Source1: icewm.desktop
# PATCH-FIX-OPENSUSE icewm-mate.patch sor.ale...@meowr.ru -- Add MATE Menus
support.
Patch0: icewm-mate.patch
+# PATCH-FEATURE-SUSE icewm-susemenu.patch ty...@suse.com -- Add xdg-menu for
SLED icewm
+Patch1: icewm-susemenu.patch
+# PATCH-FIX-UPSTREAM tweak the desktop session files to work correctly
+Patch2: icewm-session-desktop.patch
Patch99: icewm-preferences.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -126,6 +130,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Do not require needlessly new gettext.
sed -i 's/0.19.6/0.18.3/g' configure.ac
@@ -170,6 +176,15 @@
make %{?_smp_mflags}
# Patch generated lib/preferences file.
patch -p1 -i %{PATCH99}
+# And use proper branding
+%if 0%{?is_opensuse}
+wallpaper="openSUSEdefault"
+%else
+wallpaper="SLEdefault"
+%endif
+sed -i \
+ -e
"s:BRANDING_PICTURE:/usr/share/wallpapers/$wallpaper/contents/images/1920x1080.jpg:"
\
+ src/preferences
%install
%make_install
++++++ icewm-preferences.patch ++++++
--- /var/tmp/diff_new_pack.euLWTo/_old 2016-03-16 10:25:35.000000000 +0100
+++ /var/tmp/diff_new_pack.euLWTo/_new 2016-03-16 10:25:35.000000000 +0100
@@ -57,7 +57,7 @@
# Display desktop background centered and not tiled
-# DesktopBackgroundCenter=0 # 0/1
-+DesktopBackgroundCenter=1 # 0/1
++DesktopBackgroundCenter=0 # 0/1
# Support for semitransparent terminals like Eterm or gnome-terminal
# SupportSemitransparency=1 # 0/1
@@ -71,7 +71,7 @@
# Desktop background image
-# DesktopBackgroundImage=""
-+DesktopBackgroundImage="/usr/share/wallpapers/default-1600x1200.jpg"
++DesktopBackgroundImage="BRANDING_PICTURE"
# Color to announce for semi-transparent windows
# DesktopTransparencyColor=""
++++++ icewm-session-desktop.patch ++++++
>From b127566dfbdd985cd5632fe3686c77fa7f0d56b3 Mon Sep 17 00:00:00 2001
From: Brian Bidulock <bidul...@openss7.org>
Date: Wed, 10 Feb 2016 11:51:45 -0700
Subject: [PATCH] proper XSession .desktop files
---
lib/icewm-session.desktop | 58 +++++++++++++++++++++++++++++++++++++++++++----
lib/icewm.desktop | 26 +++++++++++++++++++++
4 files changed, 82 insertions(+), 4 deletions(-)
create mode 100644 lib/icewm.desktop
Index: icewm-1.3.12/lib/icewm-session.desktop
===================================================================
--- icewm-1.3.12.orig/lib/icewm-session.desktop
+++ icewm-1.3.12/lib/icewm-session.desktop
@@ -1,12 +1,62 @@
[Desktop Entry]
-Version=1.0
Encoding=UTF-8
Type=XSession
Name=IceWM Session
-Comment=Simple and fast window manger
-Terminal=false
+GenericName=Window Manager
+GenericName[fr]=Gestionnaire de Fenêtres
+GenericName[pt]=Gestor de Janelas
+Comment=This session logs you into IceWM
+Comment[az]=Bu iclas sizi Icewm'a daxil edəcək
+Comment[be]=Гэтая сэсыя завядзе вас у Icewm
+Comment[ca]=Aquesta sessió entra en Icewm
+Comment[cs]=Toto sezení vás přihlásí do Icewm
+Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i Icewm
+Comment[da]=Denne session logger dig på Icewm
+Comment[de]=Diese Sitzung meldet Sie an Icewm an
+Comment[el]=Αυτή η συνεδρία σας εισάγει στο Icewm
+Comment[es]=Con esta sesión accede a Icewm
+Comment[fi]=Tämä istunto kirjaa sisään Icewmen
+Comment[fr]=Cette session vous connectera dans Icewm
+Comment[he]=תצורת הפעלה זו מחברת אותך ל Icewm
+Comment[hi]=यह सत्र गनोम में लॉगिन होगा
+Comment[hu]=Ez a munkamenet a Icewm-ba jelentkeztet be
+Comment[it]=Sessione di lavoro con Icewm
+Comment[ja]=Icewm セッションにログインします
+Comment[ko]=Icewm세션으로 로그인합니다
+Comment[ms]=Sesi ini akan log anda ke Icewm
+Comment[nl]=Deze sessie meldt u aan bij Icewm
+Comment[nn]=Denne økta loggar på Icewm
+Comment[no]=Denne sesjonen logger deg inn til Icewm
+Comment[pl]=Sesja logowania do Icewm
+Comment[pt]=Esta sessão inicia-o no Icewm
+Comment[pt_BR]=Logar no ambiente Icewm
+Comment[ro]=Această sesiune vă va loga în Icewm
+Comment[sk]=Toto sedenie vás prihlási do prostredia Icewm
+Comment[sl]=Ta seja vas prijavi v Icewm
+Comment[sq]=Kjo seancë do t'ju fusë në Icewm
+Comment[sr@Latn]=Ova sesija vas prijavljuje na Icewm
+Comment[sr]=Ова сесија вас пријављује на Icewm
+Comment[sv]=Denna session loggar in dig i Icewm
+Comment[tr]=Bu oturum ile Icewm'a giriş yaparsınız
+Comment[uk]=Сеанс роботи в середовищі Icewm
+Comment[vi]=Session này cho bạn đăng nhập vào Icewm
+Comment[zh_CN]=此会话使您登录到 Icewm
+Comment[zh_TW]=選取這個作業階段後會進入 Icewm 環境
+Icon=icewm
+TryExec=/usr/bin/icewm-session
Exec=icewm-session
-TryExec=icewm-session
+NoDisplay=true
+Hidden=true
+Categories=WindowManager;Application;System;
+StartupNotify=false
+X-GNOME-Autostart-Notify=false
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-WMName=icewm
+DesktopNames=ICEWM
+X-LightDM-DesktopName=icewm
[Window Manager]
+Name=icewm
SessionManaged=true
+StartupNotification=false
Index: icewm-1.3.12/lib/icewm.desktop
===================================================================
--- icewm-1.3.12.orig/lib/icewm.desktop
+++ icewm-1.3.12/lib/icewm.desktop
@@ -1,8 +1,26 @@
[Desktop Entry]
-Version=1.0
Encoding=UTF-8
-Type=Application
+Type=XSession
Name=IceWM
+GenericName=Window Manager
+GenericName[fr]=Gestionnaire de Fenêtres
+GenericName[pt]=Gestor de Janelas
Comment=Simple and fast window manger
+Icon=icewm
+TryExec=/usr/bin/icewm
Exec=icewm
-TryExec=icewm
+NoDisplay=true
+Hidden=true
+Categories=WindowManager;Application;System;
+StartupNotify=false
+X-GNOME-Autostart-Notify=false
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-WMName=icewm
+DesktopNames=ICEWM
+X-LightDM-DesktopName=icewm
+
+[Window Manager]
+Name=icewm
+SessionManaged=false
+StartupNotification=false
++++++ icewm-susemenu.patch ++++++
diff --git a/lib/menu.in b/lib/menu.in
index 88a3d70..e79d828 100644
--- a/lib/menu.in
+++ b/lib/menu.in
@@ -13,5 +13,6 @@ prog XChat xchat xchat
prog Gimp gimp gimp
separator
menuprog "Desktop Apps" folder icewm-menu-fdo
-menufile Programs folder programs
+#menufile Programs folder programs
menufile Tool_bar folder toolbar
+menuprog SUSE folder xdg_menu --format icewm
diff --git a/src/wmprog.cc b/src/wmprog.cc
index d1ce6b0..5190d80 100644
--- a/src/wmprog.cc
+++ b/src/wmprog.cc
@@ -250,6 +250,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];
@@ -416,7 +424,23 @@ char *parseMenus(IApp *app, YSMListener *smActionListener,
YActionListener *wmAc
delete[] name;
delete[] icons;
delete[] command;
- } else if (!strcmp(word, "menuprogreload")) {
+ } 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;
p = YConfig::getArgument(&name, p, false);
