[packages/fvwm2] - up to 2.6.5-1 - added fvwm2-aclocal.patch and fvwm2-format-string.patch fixes to the build proce
mguevara
mguevara at pld-linux.org
Mon May 6 23:08:04 CEST 2013
commit 9ee4e8e42b0e1202ddf971a1e75dccec931f5f7f
Author: Marek Guevara Braun <mguevara at pld-linux.org>
Date: Mon May 6 23:04:34 2013 +0200
- up to 2.6.5-1
- added fvwm2-aclocal.patch and fvwm2-format-string.patch fixes to
the build process
- removed obsoleted fvwm2-libpng14.patch and fvwm2-libpng15.patch
fvwm2-aclocal.patch | 11 ++++++++
fvwm2-format-string.patch | 68 +++++++++++++++++++++++++++++++++++++++++++++++
fvwm2-libpng14.patch | 40 ----------------------------
fvwm2-libpng15.patch | 22 ---------------
fvwm2.spec | 30 ++++++++++++---------
5 files changed, 96 insertions(+), 75 deletions(-)
---
diff --git a/fvwm2.spec b/fvwm2.spec
index f56193e..c8aa161 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -7,7 +7,6 @@
%bcond_with fribidi # with bidirectional text support
%bcond_with gnome # with gnome-libs and wm-properties
%bcond_with rplay # with internal sound support (through rplay)
-#
%include /usr/lib/rpm/macros.perl
Summary: An improved version of the FVWM X-based window manager
Summary(de.UTF-8): F(?) Virtual Window Manager
@@ -19,14 +18,14 @@ Summary(pt_BR.UTF-8): Gerenciador de janelas semelhante ao mwm
Summary(ru.UTF-8): Виртуальный оконный менеджер F(?)
Summary(tr.UTF-8): Yaygın bir pencere denetleyicisi
Name: fvwm2
-Version: 2.5.28
-Release: 8
+Version: 2.6.5
+Release: 1
License: GPL
Group: X11/Window Managers
Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2
-# Source0-md5: 8e11fa4f752c568b392973d13af993df
-Source1: fvwm-2.0.46.icons.tar.gz
-# Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9
+# Source0-md5: 090ba4e0c517e8b94f71317951530f69
+Source1: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm_icons-20070101.tar.bz2
+# Source1-md5: 2ab5ee60a96830af23a43855e33afc7d
Source2: %{name}-system.%{name}rc.tar.gz
# Source2-md5: 22c1f6c5ab4bd84376daa37debd3e889
Source3: %{name}.RunWM
@@ -37,9 +36,9 @@ Patch0: %{name}-paths.patch
Patch1: FvwmPager.patch
Patch2: %{name}-locale_names.patch
Patch3: %{name}-varia.patch
-Patch4: %{name}-libpng14.patch
Patch5: %{name}-xft2-link.patch
-Patch6: %{name}-libpng15.patch
+Patch7: %{name}-aclocal.patch
+Patch8: %{name}-format-string.patch
URL: http://www.fvwm.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -55,6 +54,8 @@ BuildRequires: rpm-perlprov
%{?with_xft:BuildRequires: xorg-lib-libXft-devel}
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-lib-libXt-devel
+BuildRequires: librsvg-devel
+BuildRequires: imlib-devel
Requires(post): vfmg >= 0.9.95
Requires: fvwm2-icons = %{version}-%{release}
Requires: m4
@@ -140,9 +141,9 @@ fvwm-perllib, FvwmPerl i zależne moduły.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
-%patch6 -p1
+%patch7 -p1
+%patch8 -p1
mv -f po/FvwmScript.sv{_SE,}.po
mv -f po/FvwmTaskBar.sv{_SE,}.po
@@ -160,7 +161,6 @@ rm -f missing
--disable-command-log \
%{!?with_fribidi:--disable-bidi} \
%{!?with_xft:--disable-xft} \
- --enable-multibyte \
--enable-shape \
--enable-sm \
%{?with_gnome:--with-gnome}%{!?with_gnome:--without-gnome} \
@@ -188,9 +188,9 @@ install -d \
install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc
install fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir}
-install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+install fvwm_icons-20070101/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini-*.xpm \
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini.*.xpm \
$RPM_BUILD_ROOT%{_pixmapsdir}/mini
# Conflicts with wmmaker
@@ -235,12 +235,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fvwm/FvwmGtk
%attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmT[!a]*
+%attr(755,root,root) %{_libdir}/fvwm/FvwmTalk
%attr(755,root,root) %{_libdir}/fvwm/FvwmTaskBar
%attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]*
%attr(755,root,root) %{_libdir}/fvwm/FvwmWinList
%dir %{_datadir}/fvwm
%{_datadir}/fvwm/[!p]*
%{_datadir}/xsessions/%{name}.desktop
+%{_datadir}/locale/ar/LC_MESSAGES/FvwmScript.mo
%{?with_gnome:%{_wmpropsdir}/fvwm2.desktop}
%{_mandir}/man1/[!Ff]*.1*
%{_mandir}/man1/Fvwm[!DGPW]*.1*
@@ -250,6 +252,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/FvwmWinList.1*
%{_mandir}/man1/fvwm.1*
%{_mandir}/man1/fvwm-[!p]*.1*
+%{_mandir}/man1/fvwm2.1*
+%{_mandir}/man1/FvwmGtk.1.*
%files icons
%defattr(644,root,root,755)
diff --git a/fvwm2-aclocal.patch b/fvwm2-aclocal.patch
new file mode 100644
index 0000000..46c1eec
--- /dev/null
+++ b/fvwm2-aclocal.patch
@@ -0,0 +1,11 @@
+--- fvwm-2.6.5/configure.ac~ 2013-05-06 18:24:49.677728463 +0200
++++ fvwm-2.6.5/configure.ac 2013-05-06 22:23:48.570323806 +0200
+@@ -69,7 +69,7 @@
+ AC_SUBST(MANPAGE_PREAMBLE)
+
+ AM_INIT_AUTOMAKE(fvwm, ${version})
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+
+ # check for programs needed to build html docs
+ AC_CHECK_PROG(SED, sed, sed, "")
diff --git a/fvwm2-format-string.patch b/fvwm2-format-string.patch
new file mode 100644
index 0000000..15c49b6
--- /dev/null
+++ b/fvwm2-format-string.patch
@@ -0,0 +1,68 @@
+--- fvwm-2.6.5/libs/FRenderInit.c~ 2013-05-05 08:55:11.555668251 +0200
++++ fvwm-2.6.5/libs/FRenderInit.c 2013-05-05 08:54:36.265666672 +0200
+@@ -129,7 +129,7 @@
+ code <= FRenderErrorBase +
+ (sizeof(error_names) / sizeof(char *)) -1)
+ {
+- sprintf(msg, error_names[code - FRenderErrorBase]);
++ sprintf(msg, "%s", error_names[code - FRenderErrorBase]);
+ return 1;
+ }
+ }
+--- fvwm-2.6.5/modules/FvwmIconMan/functions.c~ 2007-01-27 12:33:16.000000000 +0100
++++ fvwm-2.6.5/modules/FvwmIconMan/functions.c 2013-05-05 11:22:41.200960493 +0200
+@@ -535,7 +535,7 @@
+ else
+ {
+ sprintf(buf, "%s\n", s);
+- ConsoleMessage(buf);
++ ConsoleMessage("%s", buf);
+ }
+
+ return 0;
+--- fvwm-2.6.5/fvwm/virtual.c~ 2011-08-16 09:05:53.000000000 +0200
++++ fvwm-2.6.5/fvwm/virtual.c 2013-05-05 11:18:18.824282087 +0200
+@@ -2020,9 +2020,9 @@
+ "The command EdgeResistance with three arguments is"
+ " obsolete. Please use the following commands"
+ " instead:");
+- fvwm_msg(OLD, "", cmd);
+- fvwm_msg(OLD, "", stylecmd);
+- fvwm_msg(OLD, "", stylecmd2);
++ fvwm_msg(OLD, "", "%s", cmd);
++ fvwm_msg(OLD, "", "%s", stylecmd);
++ fvwm_msg(OLD, "", "%s", stylecmd2);
+ execute_function(
+ cond_rc, exc, cmd,
+ FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
+--- fvwm-2.6.5/fvwm/builtins.c~ 2012-01-18 11:22:45.000000000 +0100
++++ fvwm-2.6.5/fvwm/builtins.c 2013-05-05 11:15:10.200940313 +0200
+@@ -2682,7 +2682,7 @@
+ action[len-1]='\0';
+ }
+ }
+- fvwm_msg(ECHO,"Echo",action);
++ fvwm_msg(ECHO,"Echo","%s",action);
+
+ return;
+ }
+--- fvwm-2.6.5/fvwm/move_resize.c~ 2011-09-30 11:00:53.000000000 +0200
++++ fvwm-2.6.5/fvwm/move_resize.c 2013-05-05 11:12:05.544265384 +0200
+@@ -3038,7 +3038,7 @@
+ OLD, "CMD_SnapAttraction",
+ "The command SnapAttraction is obsolete. Please use the"
+ " following command instead:");
+- fvwm_msg(OLD, "", cmd);
++ fvwm_msg(OLD, "","%s", cmd);
+ execute_function(
+ cond_rc, exc, cmd,
+ FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
+@@ -3060,7 +3060,7 @@
+ OLD, "CMD_SnapGrid",
+ "The command SnapGrid is obsolete. Please use the following"
+ " command instead:");
+- fvwm_msg(OLD, "", cmd);
++ fvwm_msg(OLD, "","%s", cmd);
+ execute_function(
+ cond_rc, exc, cmd,
+ FUNC_DONT_REPEAT | FUNC_DONT_EXPAND_COMMAND);
diff --git a/fvwm2-libpng14.patch b/fvwm2-libpng14.patch
deleted file mode 100644
index ae69d0f..0000000
--- a/fvwm2-libpng14.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- fvwm-2.5.28-orig/libs/PictureImageLoader.c 2010-01-19 23:04:51.000000000 -0500
-+++ fvwm-2.5.28/libs/PictureImageLoader.c 2010-01-19 23:09:12.000000000 -0500
-@@ -417,7 +417,7 @@
- return False;
- }
- fread(buf, 1, FPNG_BYTES_TO_CHECK, f);
-- if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK))
-+ if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return False;
-@@ -503,7 +503,7 @@
- Fpng_set_gray_to_rgb(Fpng_ptr);
- if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8)
- {
-- Fpng_set_gray_1_2_4_to_8(Fpng_ptr);
-+ Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr);
- }
- }
- for (i = 0; i < h; i++)
---- fvwm-2.5.28-orig/libs/Fpng.h 2010-01-19 23:13:34.000000000 -0500
-+++ fvwm-2.5.28/libs/Fpng.h 2010-01-19 23:15:57.000000000 -0500
-@@ -429,7 +429,7 @@
- #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
- #define FPNG_INFO_tRNS PNG_INFO_tRNS
-
--#define Fpng_check_sig(a,b) png_check_sig(a,b)
-+#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c)
- #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
- #define Fpng_create_info_struct(a) png_create_info_struct(a)
- #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
-@@ -444,7 +444,7 @@
- #define Fpng_set_packing(a) png_set_packing(a)
- #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
- #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
--#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
-+#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
- #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
- #define Fpng_read_end(a,b) png_read_end(a,b)
- #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/fvwm2-libpng15.patch b/fvwm2-libpng15.patch
deleted file mode 100644
index aceb589..0000000
--- a/fvwm2-libpng15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- fvwm-2.5.28/libs/PictureImageLoader.c~ 2012-02-12 15:50:18.574827493 +0100
-+++ fvwm-2.5.28/libs/PictureImageLoader.c 2012-02-12 15:51:19.288507908 +0100
-@@ -458,16 +458,16 @@
- {
- Fpng_set_expand(Fpng_ptr);
- }
-- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_RGB_ALPHA)
-+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_RGB_ALPHA)
- {
- hasa = 1;
- }
-- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY_ALPHA)
-+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY_ALPHA)
- {
- hasa = 1;
- hasg = 1;
- }
-- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY)
-+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY)
- {
- hasg = 1;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fvwm2.git/commitdiff/9ee4e8e42b0e1202ddf971a1e75dccec931f5f7f
More information about the pld-cvs-commit
mailing list