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

Accepting request 34218 from X11:windowmanagers

Browse Source 
Copy from X11:windowmanagers/icewm based on submit request 34218 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34218
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=18
This commit is contained in:
OBS User autobuild 2010-03-07 09:57:46 +00:00 committed by Git OBS Bridge
parent b0dd2549f9
commit f56ca8c21a
14 changed files with 163 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
icewm-1.2.30-strict-aliasing.patch
View File

@ -1,25 +0,0 @@
--- src/wmapp.cc
+++ src/wmapp.cc
@@ -336,7 +336,7 @@ static void initFontPath() {
MSG(("Font path element %d: %s", n, newFontPath[n]));
#endif
- char * icewmFontPath; // ---------- find death icewm's font path ---
+ unsigned char * icewmFontPath; // ---------- find death icewm's font path ---
Atom r_type; int r_format;
unsigned long count, bytes_remain;
@@ -346,11 +346,11 @@ static void initFontPath() {
0, PATH_MAX, False, XA_STRING,
&r_type, &r_format,
&count, &bytes_remain,
- (unsigned char **) &icewmFontPath) ==
+ &icewmFontPath) ==
Success && icewmFontPath) {
if (r_type == XA_STRING && r_format == 8) {
for (int n(ndirs - 1); n > 0; --n) // ---- remove death paths ---
- if (!strcmp(icewmFontPath, newFontPath[n])) {
+ if (!strcmp((char *) icewmFontPath, newFontPath[n])) {
memmove(newFontPath + n, newFontPath + n + 1,
(ndirs - n) * sizeof(char *));
--ndirs;

15
icewm-1.2.36-gnome-compilation.patch
View File

@ -1,15 +0,0 @@
Index: icewm-1.2.36/configure.in
===================================================================
--- icewm-1.2.36.orig/configure.in
+++ icewm-1.2.36/configure.in
@@ -820,8 +820,8 @@ AC_ARG_ENABLE(menus-gnome2,
if test "${PKG_CONFIG}" != ""; then
GNOME_VER=2
- GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
- GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
+ GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
+ GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])

15
icewm-1.2.38pre1-bad-delete.patch
View File

@ -1,15 +0,0 @@
---
src/wmprog.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- icewm-1.2.38pre1.orig/src/wmprog.cc
+++ icewm-1.2.38pre1/src/wmprog.cc
@@ -58,7 +58,7 @@ DFile::DFile(const char *name, YIcon *ic
}
DFile::~DFile() {
- delete[] fPath;
+ free(fPath);
}
void DFile::open() {

3
icewm-1.2.38pre1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:782f3a155f717f86ed613573fbd236edde3c27b7ffc6f7a4c150a10053ef5b8e
size 638425

26
icewm-1.3.6-winoptions.patch Normal file
View File

@ -0,0 +1,26 @@
---
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);

3
icewm-1.3.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d816ee9fd46dce519d2197df62a667c1cb513ab4e9f89bb55196d102d161305c
size 657270

77
icewm-LANG.menu.patch
View File

@ -1,77 +0,0 @@
--- icewm-orig/src/yapp.cc 2004-05-23 08:18:19.000000000 +0200
+++ icewm-1.2.14/src/yapp.cc 2004-08-05 13:56:31.000000000 +0200
@@ -61,23 +61,68 @@
return findConfigFile(name, R_OK);
}
+static char *access_ok(char *name, int n_locale_suffixes, char **locale_suffixes, int mode)
+{
+ int i;
+ char *p;
+ for(i=0; i<n_locale_suffixes-1; i++) {
+ p = strJoin(name, ".", locale_suffixes[i], NULL);
+ if (access(p, mode) == 0) {
+ delete name;
+ return p;
+ }
+ delete p;
+ }
+ if (access(name, mode) == 0) return name;
+ delete name;
+ return 0;
+}
+
+#include <locale.h>
+#include <string.h>
+
char *YApplication::findConfigFile(const char *name, int mode) {
char *p;
+ static char *locale_suffixes[3];
+ static int n_locale_suffixes = -1;
+ static char *locale;
+ if (n_locale_suffixes < 0) {
+ locale = setlocale(LC_MESSAGES, NULL);
+ n_locale_suffixes = 0;
+ if (strcmp(locale, "C") && strcmp(locale, "POSIX")) {
+ locale = strdup(locale);
+ p = strchr(locale, '@');
+ if (p) {
+ *p = 0;
+ }
+ p = strchr (locale, '.');
+ if (p) {
+ locale_suffixes[n_locale_suffixes++] = strdup(locale);
+ *p = 0;
+ }
+ p = strchr(locale, '_');
+ if (p) {
+ locale_suffixes[n_locale_suffixes++] = strdup(locale);
+ *p = 0;
+ }
+ locale_suffixes[n_locale_suffixes++] = strdup(locale);
+ }
+ }
if (name[0] == '/')
return newstr(name);
p = strJoin(getPrivConfDir(), "/", name, NULL);
- if (access(p, mode) == 0) return p;
- delete[] p;
+ p = access_ok(p, n_locale_suffixes, locale_suffixes, mode);
+ if (p) return p;
p = strJoin(configDir, "/", name, NULL);
- if (access(p, mode) == 0) return p;
- delete[] p;
+ p = access_ok(p, n_locale_suffixes, locale_suffixes, mode);
+ if (p) return p;
p = strJoin(REDIR_ROOT(libDir), "/", name, NULL);
- if (access(p, mode) == 0) return p;
- delete[] p;
+ p = access_ok(p, n_locale_suffixes, locale_suffixes, mode);
+ if (p) return p;
return 0;
}

15
icewm-docdir.patch
View File

@ -1,8 +1,11 @@
Index: Makefile.in
===================================================================
---
Makefile.in | 10 +++++-----
src/Makefile.in | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
--- Makefile.in.orig
+++ Makefile.in
@@ -121,12 +121,12 @@ install-base: base
@@ -116,12 +116,12 @@ install-base: base
install-docs: docs
@echo ------------------------------------------
@ -20,16 +23,14 @@ Index: Makefile.in
@echo ------------------------------------------
install-nls: nls
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -33,7 +33,7 @@ DEFS = @DEFS@ \
@@ -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) \
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`

12
icewm-lite.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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

69
icewm-lite.desktop Normal file
View File

@ -0,0 +1,69 @@
[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 的窗口管理器

36
icewm-lite.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package icewm-lite (Version 1.2.38)
# spec file for package icewm-lite (Version 1.3.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@ -20,26 +20,25 @@
Name: icewm-lite
BuildRequires: freetype2-devel gcc-c++ xorg-x11-devel
License: LGPL v2.1 or later
License: LGPLv2.1+
Group: System/GUI/Other
Provides: icewm-bin
Requires: icewm
Conflicts: icewm-default
AutoReqProv: on
Version: 1.2.38
Release: 2
%define real_version 1.2.38pre1
Source: icewm-%{real_version}.tar.bz2
Patch0: icewm-LANG.menu.patch
Version: 1.3.6
Release: 1
Source: icewm-%version.tar.bz2
Source1: %{name}.desktop
Patch1: icewm-multiByte.patch
Patch2: icewm-menu.patch
Patch3: icewm-docdir.patch
Patch4: icewm-1.2.30-strict-aliasing.patch
Patch5: icewm-1.2.35-override-config.patch
Patch8: icewm-1.2.35-empty-winmenu.patch
Patch9: icewm-1.2.35-unaligned-access.patch
Patch10: icewm-1.2.36-gnome-compilation.patch
Patch11: icewm-1.2.38pre1-bad-delete.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
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
Summary: IceWM Window Manager--Lite Version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -60,17 +59,14 @@ Authors:
Marko Macek <Marko.Macek@gmx.net>
%prep
%setup -q -n icewm-%real_version
%patch0 -p1
%setup -q -n icewm-%version
%patch1
%patch2
%patch3
%patch4
%patch5
%patch8
%patch9
%patch10 -p1
%patch11 -p1
%patch6
%patch7 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}

2
icewm-multiByte.patch
View File

@ -6,7 +6,7 @@ Index: src/ylocale.cc
"Falling back to 'C' locale'."));
fLocaleName = setlocale(LC_ALL, "C");
}
-/// TODO #warning "should always use multibyte/fontset if I18N"
-#warning "P1 should always use multibyte/fontset if I18N"
- multiByte = (MB_CUR_MAX > 1);
+ multiByte = true;

12
icewm.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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

39
icewm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package icewm (Version 1.2.38)
# spec file for package icewm (Version 1.3.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@ -19,30 +19,26 @@
Name: icewm
BuildRequires: gcc-c++ giflib-devel gnome-desktop-devel imlib-devel libgnomeui-devel libtiff-devel update-desktop-files
BuildRequires: gcc-c++ gnome-desktop-devel libgnomeui-devel update-desktop-files
%if 0%{?suse_version} >= 1030
BuildRequires: fdupes
%endif
License: LGPL v2.1 or later
License: LGPLv2.1+
Group: System/GUI/Other
Provides: windowmanager
Requires: icewm-bin, xdg-menu, desktop-data
AutoReqProv: on
Version: 1.2.38
Release: 2
%define real_version 1.2.38pre1
Source: icewm-%{real_version}.tar.bz2
Version: 1.3.6
Release: 1
Source: icewm-%version.tar.bz2
Source1: %{name}.desktop
Patch0: icewm-LANG.menu.patch
Patch1: icewm-multiByte.patch
Patch2: icewm-menu.patch
Patch3: icewm-docdir.patch
Patch4: icewm-1.2.30-strict-aliasing.patch
Patch5: icewm-1.2.35-override-config.patch
Patch8: icewm-1.2.35-empty-winmenu.patch
Patch9: icewm-1.2.35-unaligned-access.patch
Patch10: icewm-1.2.36-gnome-compilation.patch
Patch11: icewm-1.2.38pre1-bad-delete.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
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
@ -63,7 +59,7 @@ Authors:
Marko Macek <Marko.Macek@gmx.net>
%package default
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: Window Manager with a Taskbar--Default Version
Group: System/GUI/Other
Provides: icewm-bin
@ -84,7 +80,7 @@ Authors:
Marko Macek <Marko.Macek@gmx.net>
%package gnome
License: LGPL v2.1 or later
License: LGPLv2.1+
Summary: Windowmanager with Taskbar - gnome version
Group: System/GUI/GNOME
Requires: icewm-default
@ -104,17 +100,14 @@ Authors:
Marko Macek <Marko.Macek@gmx.net>
%prep
%setup -q -n icewm-%real_version
%patch0 -p1
%setup -q
%patch1
%patch2
%patch3
%patch4
%patch5
%patch8
%patch9
%patch10 -p1
%patch11 -p1
%patch6
%patch7 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}