Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit icewm for openSUSE:Factory
Hello community,

here is the log from the commit of package icewm for openSUSE:Factory checked
in at 2019-04-17 10:04:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icewm (Old)
and /work/SRC/openSUSE:Factory/.icewm.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icewm"

Wed Apr 17 10:04:09 2019 rev:59 rq:693037 version:1.5.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2018-09-20
11:41:27.376856633 +0200
+++ /work/SRC/openSUSE:Factory/.icewm.new.17052/icewm.changes 2019-04-17
10:04:11.990488280 +0200
@@ -1,0 +2,17 @@
+Wed Apr 3 06:00:40 UTC 2019 - qzheng <qzheng@xxxxxxxx>
+
+- Update to 1.5.3
+- Rebase patches
+ - icewm-susemenu.patch: rebase "suseprog" function
+ - icewm-desktop-nodisplay.patch: rebase, set NoDisplay for
+ icewm.desktop
+ - icewm-preferences.patch: rebase, only IconPath hunk not in
+ upstream now
+- Drop patches
+ - icewm-mate.patch: upstream no longer uses icewm-menu-gnome2 to
+ generate a default menu, the current freedesktop.org approach
+ is superior for current distros
+ - icewm-use-iproute2-ss-instead-of-netstat.patch:
+ was accepted by upstream
+
+-------------------------------------------------------------------

Old:
----
icewm-1.4.2.tar.bz2
icewm-mate.patch
icewm-use-iproute2-ss-instead-of-netstat.patch

New:
----
icewm-1.5.3.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.xvvE7X/_old 2019-04-17 10:04:13.238489783 +0200
+++ /var/tmp/diff_new_pack.xvvE7X/_new 2019-04-17 10:04:13.242489788 +0200
@@ -1,7 +1,7 @@
#
# spec file for package icewm
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,21 +18,17 @@

%global lites icewm icewmhint icewmbg icesh icewm-session
Name: icewm
-Version: 1.4.2
+Version: 1.5.3
Release: 0
Summary: Window Manager with a Taskbar
License: LGPL-2.1-or-later
Group: System/GUI/Other
-Url: http://www.icewm.org/
-Source0:
https://github.com/bbidulock/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei@xxxxxxxx -- Add MATE Menus
support.
-Patch0: icewm-mate.patch
+Url: https://ice-wm.org/
+Source0:
https://github.com/ice-wm/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
# PATCH-FEATURE-SUSE icewm-susemenu.patch tyang@xxxxxxxx -- Add xdg-menu for
SLED icewm
Patch1: icewm-susemenu.patch
# PATCH-FIX-OPENSUSE icewm-desktop-nodisplay.patch qkzhu@xxxxxxxx -- Set
NoDisplay for icewm.desktop
Patch2: icewm-desktop-nodisplay.patch
-# PATCH-FIX-UPSTREAM icewm-use-iproute2-ss-instead-of-netstat.patch
qzheng@xxxxxxxx -- Use ss instead of netstat
-Patch3: icewm-use-iproute2-ss-instead-of-netstat.patch
Patch99: icewm-preferences.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -142,10 +138,9 @@

%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+
# Do not require needlessly new gettext.
sed -i 's/0.19.6/0.18.3/g' configure.ac

@@ -279,7 +274,8 @@
%{_datadir}/xsessions/icewm-session.desktop
%{_datadir}/xsessions/icewm.desktop
%{_datadir}/xsessions/default.desktop
-%{_mandir}/man1/icewm.1%{?ext_man}
+%{_mandir}/man1/
+%{_mandir}/man5/

%files config-upstream
%dir %{_sysconfdir}/icewm/
@@ -307,7 +303,7 @@
%{_bindir}/icesh
%{_bindir}/icewm-session
%{_bindir}/icewm-menu-fdo
-%{_datadir}/applications/icewm.desktop
+%{_bindir}/icewm-menu-xrandr

%files lite
%ghost %{_sysconfdir}/alternatives/icewm

++++++ icewm-desktop-nodisplay.patch ++++++
--- /var/tmp/diff_new_pack.xvvE7X/_old 2019-04-17 10:04:13.254489802 +0200
+++ /var/tmp/diff_new_pack.xvvE7X/_new 2019-04-17 10:04:13.262489812 +0200
@@ -1,17 +1,8 @@
-From 3d09111fa081005c772c2942d42cc2d1600047f5 Mon Sep 17 00:00:00 2001
-From: Chingkai <qkzhu@xxxxxxxx>
-Date: Wed, 20 Dec 2017 15:13:07 +0800
-Subject: [PATCH] Set NoDisplay for icewm.desktop
-
----
- lib/icewm.desktop | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: icewm-1.4.2/lib/icewm.desktop
-===================================================================
---- icewm-1.4.2.orig/lib/icewm.desktop
-+++ icewm-1.4.2/lib/icewm.desktop
-@@ -11,7 +11,7 @@ Comment[da]=Simpel og hurtig vindueshån
+diff --git a/lib/icewm.desktop b/lib/icewm.desktop
+index d6e5a04..02618b5 100644
+--- a/lib/icewm.desktop
++++ b/lib/icewm.desktop
+@@ -11,7 +11,7 @@ Comment[da]=Simpel og hurtig vindueshåndtering
Icon=icewm
TryExec=/usr/bin/icewm
Exec=icewm

++++++ icewm-preferences.patch ++++++
--- /var/tmp/diff_new_pack.xvvE7X/_old 2019-04-17 10:04:13.266489817 +0200
+++ /var/tmp/diff_new_pack.xvvE7X/_new 2019-04-17 10:04:13.266489817 +0200
@@ -14,22 +14,19 @@
vi lib/preferences
quilt refresh
---
- src/preferences | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: src/preferences
-===================================================================
+diff --git a/src/preferences b/src/preferences
+index dbf965e..94d8053 100644
--- a/src/preferences
+++ b/src/preferences
-@@ -543,6 +543,7 @@
+@@ -555,6 +555,7 @@

# Icon search path (colon separated)
- # IconPath="/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps"
+ #
IconPath="/usr/share/icons/oxygen/base:/usr/share/icons/Adwaita:/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps:/usr/local/share/icons/hicolor:"

+IconPath="/usr/share/icons/Adwaita/16x16/apps:/usr/share/icons/hicolor:/usr/share/icons:/usr/share/pixmaps"

# Mailbox path (use $MAIL instead)
# MailBoxPath=""
-@@ -545,7 +545,7 @@
+@@ -569,7 +570,7 @@
# NewMailCommand=""

# Command to lock display/screensaver
@@ -38,21 +35,21 @@

# Command to run on clock
# ClockCommand="xclock -name icewm -title Clock"
-@@ -569,10 +569,10 @@
+@@ -592,10 +593,10 @@
# LogoutCancelCommand=""

# Command to shutdown the system
--# ShutdownCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl
poweroff; } ||:""
+-# ShutdownCommand="test -e /run/systemd/system && systemctl poweroff"
+ShutdownCommand="/bin/sh -c 'systemctl poweroff ||:'"

# Command to reboot the system
--# RebootCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl
reboot; } ||:""
+-# RebootCommand="test -e /run/systemd/system && systemctl reboot"
+RebootCommand="/bin/sh -c 'systemctl reboot ||:'"

- # Command to run on CPU status
- # CPUStatusCommand="xterm -name top -title Process\ Status -e top"
-@@ -1328,19 +1328,19 @@
- #
+ # Command to send the system to standby mode
+ # SuspendCommand="test -e /run/systemd/system && systemctl suspend"
+@@ -1323,16 +1324,16 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4 "
+ # DesktopBackgroundMultihead=0 # 0/1

# Display desktop background centered and not tiled
-# DesktopBackgroundCenter=0 # 0/1
@@ -61,16 +58,13 @@
# Support for semitransparent terminals like Eterm or gnome-terminal
# SupportSemitransparency=1 # 0/1

- # Desktop background scaled to full screen
+ # Resize desktop background to full screen
-# DesktopBackgroundScaled=0 # 0/1
+DesktopBackgroundScaled=1 # 0/1

- # Desktop background color
- # DesktopBackgroundColor="rgb:00/20/40"
-
- # Desktop background image
+ # Desktop background image(s)
-# DesktopBackgroundImage=""
+DesktopBackgroundImage="BRANDING_PICTURE"

- # Color to announce for semi-transparent windows
- # DesktopTransparencyColor=""
+ # Desktop background color(s)
+ # DesktopBackgroundColor=""

++++++ icewm-susemenu.patch ++++++
--- /var/tmp/diff_new_pack.xvvE7X/_old 2019-04-17 10:04:13.274489826 +0200
+++ /var/tmp/diff_new_pack.xvvE7X/_new 2019-04-17 10:04:13.274489826 +0200
@@ -1,60 +1,89 @@
diff --git a/lib/menu.in b/lib/menu.in
-index 88a3d70..e79d828 100644
+index f200514..3118471 100644
--- a/lib/menu.in
+++ b/lib/menu.in
-@@ -13,5 +13,6 @@ prog XChat xchat xchat
+@@ -12,5 +12,6 @@ prog Firefox mozilla firefox
+ prog Hexchat xchat hexchat
prog Gimp gimp gimp
- separator
- menuprog "Desktop Apps" folder icewm-menu-fdo
+ includeprog icewm-menu-fdo --sep-before --no-sep-others
-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
-@@ -429,7 +429,42 @@ char *parseMenus(
- if (progmenu)
- container->addContainer(name.cstr(), icon, progmenu);
- }
-- } else if (!strcmp(word, "menuprogreload")) {
-+ } else if (!strcmp(word, "suseprog")) {
-+ Argument name;
-+
-+ p = YConfig::getArgument(&name, p);
-+ if (p == 0) return p;
-+
-+ Argument icons;
-+
-+ p = YConfig::getArgument(&icons, p);
-+ if (p == 0) return p;
-+
-+ Argument command;
-+ YStringArray args;
-+
-+ p = getCommandArgs(p, &command, args);
-+ if (p == 0) {
-+ msg(_("Error at prog %s"), name.cstr());
-+ return p;
-+ }
+diff --git a/src/wmmenu.cc b/src/wmmenu.cc
+index ccee25e..ec2ff81 100644
+--- a/src/wmmenu.cc
++++ b/src/wmmenu.cc
+@@ -297,6 +297,45 @@ char* MenuLoader::parseMenuProg(char *p, ObjectContainer
*container)
+ return p;
+ }
+
++char* MenuLoader::parseSuseProg(char *p, ObjectContainer *container)
++{
++ Argument name;
++
++ p = YConfig::getArgument(&name, p);
++ if (p == 0) return p;
++
++ Argument icons;
++
++ p = YConfig::getArgument(&icons, p);
++ if (p == 0) return p;
+
-+ ref<YIcon> icon;
++ Argument command;
++ YStringArray args;
++
++ p = getCommandArgs(p, &command, args);
++ if (p == 0) {
++ msg(_("Error at prog %s"), name.cstr());
++ return p;
++ }
++
++ ref<YIcon> icon;
+#ifndef LITE
-+ if (icons[0] != '-')
-+ icon = YIcon::getIcon(icons);
++ if (icons[0] != '-')
++ icon = YIcon::getIcon(icons);
+#endif
-+ MSG(("suseprog %s %s", name.cstr(), command.cstr()));
++ MSG(("suseprog %s %s", name.cstr(), command.cstr()));
+
-+ upath fullPath = findPath(getenv("PATH"), X_OK,
command.cstr());
-+ if (fullPath != null) {
-+ ObjectMenu *progmenu = new MenuProgMenu(
-+ app, smActionListener, wmActionListener,
-+ name.cstr(), command.cstr(), args, 0);
-+ if (progmenu)
-+ container->addContainer(name.cstr(), icon, progmenu);
-+ }
-+ } else if (!strcmp(word, "menuprogreload")) {
- Argument name;
++ upath fullPath = findPath(getenv("PATH"), X_OK, command.cstr());
++ if (fullPath != null) {
++ ObjectMenu *progmenu = new MenuProgMenu(
++ app, smActionListener, wmActionListener,
++ name.cstr(), command.cstr(), args, 0);
++ if (progmenu)
++ container->addContainer(name.cstr(), icon, progmenu);
++ }
++ return p;
++}
++
+ char* MenuLoader::parseMenuProgReload(char *p, ObjectContainer *container)
+ {
+ Argument name;
+@@ -398,6 +437,9 @@ char* MenuLoader::parseWord(char *word, char *p,
ObjectContainer *container)
+ else if (!strcmp(word, "menuprogreload")) {
+ p = parseMenuProgReload(p, container);
+ }
++ else if (!strcmp(word, "suseprog")) {
++ p = parseSuseProg(p, container);
++ }
+ else if (!strcmp(word, "include")) {
+ p = parseIncludeStatement(p, container);
+ }
+diff --git a/src/wmprog.h b/src/wmprog.h
+index 4e9bd1f..d5b9827 100644
+--- a/src/wmprog.h
++++ b/src/wmprog.h
+@@ -31,10 +31,12 @@ private:
+ char* parseMenuFile(char *data, ObjectContainer *container);
+ char* parseMenuProg(char *data, ObjectContainer *container);
+ char* parseMenuProgReload(char *data, ObjectContainer *container);
++ char* parseSuseProg(char *p, ObjectContainer *container);
+ char* parseKey(char *word, char *p);
+ char* parseProgram(char *word, char *p, ObjectContainer *container);
+ char* parseWord(char *word, char *p, ObjectContainer *container);

- p = YConfig::getArgument(&name, p);
++
+ IApp *app;
+ YSMListener *smActionListener;
+ YActionListener *wmActionListener;


< Previous Next >
This Thread
  • No further messages