[icewm/f18] - 1.3.38.^M- Clearlooks_v3: clearlooks_2px added. Should solve #981758 and #960663.
Gilboa Davara
gilboa at fedoraproject.org
Mon Dec 16 10:41:27 UTC 2013
commit 2ac5c50da47990657d44580a6d29bd0d6d0ffdfb
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Mon Dec 16 12:41:30 2013 +0200
- 1.3.38.^M- Clearlooks_v3: clearlooks_2px added. Should solve #981758 and #960663.
.gitignore | 2 +
icewm-1.2.30-apm-battery.patch | 11 -----
icewm-1.3.7-configurenotify.patch | 19 ---------
icewm-1.3.7-deprecated.patch | 14 -------
icewm-1.3.8-deprecated.patch | 11 +++++
icewm-fribidi.patch => icewm-1.3.8-fribidi.patch | 24 ++++++-----
icewm-menu.patch => icewm-1.3.8-menu.patch | 7 +--
icewm-configure.patch | 21 ----------
icewm-wmclient.patch | 24 -----------
icewm.spec | 46 +++++++++++----------
sources | 5 +-
11 files changed, 55 insertions(+), 129 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2e0b64..24d2698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
icewm-1.2.37.tar.gz
/clearlooks.tgz
+/icewm-1.3.8.tar.gz
+/clearlooks-v3.tgz
diff --git a/icewm-1.3.8-deprecated.patch b/icewm-1.3.8-deprecated.patch
new file mode 100644
index 0000000..fd65d73
--- /dev/null
+++ b/icewm-1.3.8-deprecated.patch
@@ -0,0 +1,11 @@
+--- src/base.h.old 2013-12-16 10:42:42.980667132 +0200
++++ src/base.h 2013-12-16 10:42:48.676676499 +0200
+@@ -1,7 +1,7 @@
+ #ifndef __BASE_H
+ #define __BASE_H
+
+-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
++#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+ #define _icewm_deprecated __attribute__((deprecated))
+ #else
+ #define _icewm_deprecated
diff --git a/icewm-fribidi.patch b/icewm-1.3.8-fribidi.patch
similarity index 75%
rename from icewm-fribidi.patch
rename to icewm-1.3.8-fribidi.patch
index 66691d7..414eaa5 100644
--- a/icewm-fribidi.patch
+++ b/icewm-1.3.8-fribidi.patch
@@ -58,26 +58,28 @@
}
static void textExtents(XftFont * font, char_t * str, size_t len,
---- configure.in.old 2009-09-25 00:05:08.000000000 +0300
-+++ configure.in 2009-09-25 00:07:14.000000000 +0300
-@@ -307,6 +307,20 @@
+--- configure.in.old 2013-12-16 11:25:17.668872153 +0200
++++ configure.in 2013-12-16 11:38:49.789208871 +0200
+@@ -307,6 +307,22 @@
features="${features} i18n"
fi
+dnl =================================================== Right to left support ===
+dnl
+AC_ARG_ENABLE(fribidi,
-+ [ --disable-fribidi Disable right to left support])
-+
-+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
-+ PKG_CHECK_MODULES(FRIBIDI, fribidi)
++[ --disable-fribidi Disable right to left support])
+
-+ AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
-+
-+ CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
-+ CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
++if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
++ AC_CHECK_LIB(fribidi, fribidi_log2vis,
++ [ AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
++ FRIBIDI_CFLAGS=`pkg-config fribidi --cflags`
++ CORE_CFLAGS="${CORE_CFLAGS} -I/usr/include/fribidi"
++ FRIBIDI_LIBS=`pkg-config fribidi --libs`
++ CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}" ],
++ [ AC_MSG_ERROR("fribidi library must be installed") ])
+fi
+
++
dnl ============================================================ NLS Support ===
dnl
AC_ARG_ENABLE(nls,
diff --git a/icewm-menu.patch b/icewm-1.3.8-menu.patch
similarity index 79%
rename from icewm-menu.patch
rename to icewm-1.3.8-menu.patch
index d706c63..85b2259 100644
--- a/icewm-menu.patch
+++ b/icewm-1.3.8-menu.patch
@@ -1,6 +1,6 @@
---- icewm-1.3.7/lib/menu.in.old 2012-06-10 08:59:34.000000000 +0300
-+++ icewm-1.3.7/lib/menu.in 2012-06-10 09:00:16.000000000 +0300
-@@ -4,16 +4,9 @@
+--- lib/menu.in.old 2013-11-17 18:54:39.000000000 +0200
++++ lib/menu.in 2013-12-16 10:21:16.175549044 +0200
+@@ -4,15 +4,9 @@
# since modifications to this file will be discarded when you
# (re)install icewm.
#
@@ -14,7 +14,6 @@
+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
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 at GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
-menufile Programs folder programs
diff --git a/icewm.spec b/icewm.spec
index 690db65..5c7a8c1 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,6 +1,6 @@
Name: icewm
-Version: 1.3.7
-Release: 9%{?dist}
+Version: 1.3.8
+Release: 1%{?dist}
Summary: Light and configurable window manager
Group: User Interface/Desktops
License: LGPLv2+
@@ -9,7 +9,7 @@ Source0: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version
Source1: http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
Source2: icewm.desktop
Source3: icewm-startup
-Source4: clearlooks.tgz
+Source4: clearlooks-v3.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: giflib-devel
@@ -33,17 +33,14 @@ Requires: alsa-utils
Requires: xdg-utils
Requires: xterm
-Patch0: icewm-configure.patch
-Patch1: icewm-menu.patch
+Patch1: icewm-1.3.8-menu.patch
Patch2: icewm-toolbar.patch
Patch3: icewm-keys.patch
-Patch4: icewm-fribidi.patch
+Patch4: icewm-1.3.8-fribidi.patch
Patch5: icewm-1.3.7-dso.patch
Patch6: icewm-defaults.patch
-Patch7: icewm-wmclient.patch
-Patch8: icewm-1.3.7-menuiconsize.patch
-Patch9: icewm-1.3.7-configurenotify.patch
-Patch10: icewm-1.3.7-deprecated.patch
+Patch7: icewm-1.3.7-menuiconsize.patch
+Patch8: icewm-1.3.8-deprecated.patch
%description
@@ -93,16 +90,14 @@ older Fedora releases and RHEL.
%prep
%setup -q
-%patch1 -p1 -b .menu
+%patch1 -p0 -b .menu
%patch2 -p1 -b .toolbar
%patch3 -p1 -b .keys
%patch4 -p0 -b .fribidi
%patch5 -p0 -b .dso
%patch6 -p0 -b .defaults
-%patch7 -p0 -b .wmclient
-%patch8 -p1 -b .menuiconsize
-%patch9 -p1 -b .dont_send_config_notify
-%patch10 -p1 -b .redefine_icewm_deprecated
+%patch7 -p1 -b .menuiconsize
+%patch8 -p0 -b .deprecated
%build
@@ -113,7 +108,6 @@ autoconf
--enable-antialiasing \
--enable-i18n \
--enable-menus-gnome2 \
- --disable-menus-gnome1 \
--with-cfgdir=%{_sysconfdir}/icewm
make %{?_smp_mflags}
@@ -184,11 +178,19 @@ rm -rf $RPM_BUILD_ROOT
%files clearlooks
%defattr(-,root,root,-)
+%{_datadir}/icewm/themes/clearlooks-2px
%{_datadir}/icewm/themes/clearlooks
%{_datadir}/icewm/theme
%changelog
+* Mon Dec 16 2013 Gilboa Davara <gilboad [AT] gmail.com> - 1.3.8-1
+- 1.3.38.
+- Clearlooks_v3: clearlooks_2px added. Should solve #981758 and #960663.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Sun Jun 09 2013 Gilboa Davara <gilboad [AT] gmail.com> - 1.3.7-9
- Fix #925574 by calling autoconf. (Temporary solution, pending upsteam fix).
@@ -219,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Wed Nov 11 2011 Gilboa Davara <gilboad[AT]gmail.com> - 1.3.7-1
+* Fri Nov 11 2011 Gilboa Davara <gilboad[AT]gmail.com> - 1.3.7-1
- Switch to 1.3.7 tree.
- Fixes bugs: #694532, #689804, #696291, #694622, #716218, #754124.
- Add Marcus Moeller's menu icon size and wmclient patches.
@@ -236,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
- Rebuild for libgnome-desktop soname bump
- Fix mixed use of tabs and spaces
-* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-5
+* Thu Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-5
- Patch in missing fribidi support. (#515134)
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
@@ -267,7 +269,7 @@ rm -rf $RPM_BUILD_ROOT
- 1.2.35.
- Missing BR: xorg-x11-fonts-truetype. (#351811)
-* Wed Oct 09 2007 <gilboad[AT]gmail.com> - 1.2.32-5
+* Tue Oct 09 2007 <gilboad[AT]gmail.com> - 1.2.32-5
- EL-5 support.
- Missing BR - libgif-devel.
- Devel: Replace redhat-artwork with bluecurve-icon-theme.
@@ -328,7 +330,7 @@ rm -rf $RPM_BUILD_ROOT
- Push -gnome's BR to main package.
- Change hard-coded sysconf path.
-* Tue Jan 18 2007 <gilboad[AT]gmail.com> - 1.2.30-6
+* Thu Jan 18 2007 <gilboad[AT]gmail.com> - 1.2.30-6
- Change license back to LGPL.
- Change summery.
- New sub-package: -gnome. (GNOME menu support.)
@@ -368,9 +370,9 @@ rm -rf $RPM_BUILD_ROOT
* Sat Jan 13 2007 <gilboad[AT]gmail.com> - 1.2.30-3
- Fix wrong license. (Was LGPL, should be GPL.)
-* Tue Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-2
+* Thu Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-2
- Manually add missing man page.
-* Tue Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-1
+* Thu Jan 11 2007 <gilboad[AT]gmail.com> - 1.2.30-1
- Initial release.
diff --git a/sources b/sources
index e603fc6..d2fac9e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-224695231aedb2b91db3254a13e1c8dd icewm-1.3.7.tar.gz
-e9d3d7302fb2940ca41ee5eb68816270 clearlooks.tgz
-95ebae3c617b6098cd0be9e21768ce27 clearlooks.tgz
+6d61aced3bd20b9e7caeb7e8380368c8 icewm-1.3.8.tar.gz
+584627d54afa6f975ce4ab90bcf96f54 clearlooks-v3.tgz
More information about the scm-commits
mailing list