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

Accepting request 230300 from X11:windowmanagers

Browse Source 
Added --prefix=/usr and --datadir=/usr/share to %configure to
  correct paths to better match with other WindowManagers in
  openSUSE
- Updated WindowMaker-menu.patch with corrected paths
- Created patch to fix wmgenmenu to remove hardcodes in source
  Add: fix_wmgenmenu_paths.patch
 (forwarded request 229666 from sfalken)

OBS-URL: https://build.opensuse.org/request/show/230300
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=34
This commit is contained in:
Tomáš Chvátal 2014-04-17 12:09:52 +00:00 committed by Git OBS Bridge
commit ec1224b248
4 changed files with 496 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

799
WindowMaker-menu.patch
View File

File diff suppressed because it is too large Load Diff

10
WindowMaker.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Apr 10 20:57:27 UTC 2014 - sfalken@opensuse.org
- Added --prefix=/usr and --datadir=/usr/share to %configure to
correct paths to better match with other WindowManagers in
openSUSE
- Updated WindowMaker-menu.patch with corrected paths
- Created patch to fix wmgenmenu to remove hardcodes in source
Add: fix_wmgenmenu_paths.patch
-------------------------------------------------------------------
Sat Sep 14 09:58:39 UTC 2013 - chris@computersalat.de

9
WindowMaker.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package WindowMaker
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 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
@ -35,6 +35,7 @@ Source6: windowmaker
Source7: %{name}-rpmlintrc
Patch1: %{name}-config.patch
Patch2: %{name}-menu.patch
Patch3: fix_wmgenmenu_paths.patch
#
Patch101: wm-giflib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -93,7 +94,8 @@ developing applications which use WindowMaker.
mkdir menu_orig
cp %{name}/{menu.*,plmenu.*} menu_orig
%patch1
%patch2
%patch2 -p1
%patch3 -p1
%patch101
cp %{S:4} .
cp %{S:6} .
@ -113,6 +115,8 @@ export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl n
%endif
export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
%configure \
--prefix=/usr \
--datadir=/usr/share \
--disable-static \
--with-pic\
--sysconfdir=/etc/X11 \
@ -125,6 +129,7 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
make %{?_smp_mflags}
(cd %{name}-extra-0.1
%configure \
--prefix=/usr \
--disable-static \
--with-pic\
--with-pixmapdir=/usr/share/%{name}/Pixmaps

76
fix_wmgenmenu_paths.patch Normal file
View File

@ -0,0 +1,76 @@
From 3981805ec78adf4479f0988cfc2174a02d58a738 Mon Sep 17 00:00:00 2001
From: "Carlos R. Mafra" <crmafra@gmail.com>
Date: Thu, 10 Apr 2014 19:34:48 +0100
Subject: [PATCH] wmgenmenu: Write paths according to options set at configure
time
As reported by Shawn W Dunn, the configuration strings written by wmgenmenu
in $HOME/GNUstep/Defaults/WMRootMenu were not reflecting his installation
directories choices.
Fix this by writing strings composed with PKGDATADIR.
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
---
diff -rupN WindowMaker-0.95.4.old/util/wmgenmenu.c WindowMaker-0.95.4/util/wmgenmenu.c
--- WindowMaker-0.95.4.old/util/wmgenmenu.c 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/util/wmgenmenu.c 2014-04-10 13:02:00.693514632 -0700
@@ -35,6 +35,13 @@ int main(int argc, char *argv[])
{
char *t;
int ch;
+ char *tmp, *theme_paths, *style_paths, *icon_paths, *bg_paths;
+
+ tmp = wstrconcat("-noext ", PKGDATADIR);
+ theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
+ style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
+ icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
+ bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t");
struct option longopts[] = {
{ "version", no_argument, NULL, 'v' },
@@ -146,7 +153,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Themes")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ WMCreatePLString(theme_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -155,7 +162,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Styles")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ WMCreatePLString(style_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -164,7 +171,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Icon Sets")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ WMCreatePLString(icon_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -232,7 +239,7 @@ int main(int argc, char *argv[])
L3Menu = WMCreatePLArray(
WMCreatePLString(_("Images")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
+ WMCreatePLString(bg_paths),
NULL
);
WMAddToPLArray(L2Menu, L3Menu);
@@ -321,7 +328,7 @@ int main(int argc, char *argv[])
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Configure Window Maker")),
WMCreatePLString("EXEC"),
- WMCreatePLString("WPrefs"),
+ WMCreatePLString("/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"),
NULL
);
WMAddToPLArray(RMenu, L1Menu);