Hello community, here is the log from the commit of package gnash for openSUSE:Factory checked in at 2014-03-18 13:46:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnash (Old) and /work/SRC/openSUSE:Factory/.gnash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnash" Changes: -------- --- /work/SRC/openSUSE:Factory/gnash/gnash.changes 2013-08-27 20:44:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnash.new/gnash.changes 2014-03-18 13:46:22.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Mar 13 12:46:09 UTC 2014 - [email protected] + +- gnash-config-plugindir.patch: fix kde4 plugindir check +- gnash-getopt.patch: fix use of getopt return value +- use correct kde4 plugindir + +------------------------------------------------------------------- +Tue Sep 17 13:27:46 UTC 2013 - [email protected] + +- explicitly set kde4 plugindir (fixes powerpc32 build) + +------------------------------------------------------------------- New: ---- gnash-config-plugindir.patch gnash-getopt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.GjtMXa/_old 2014-03-18 13:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.GjtMXa/_new 2014-03-18 13:46:23.000000000 +0100 @@ -29,6 +29,9 @@ Patch2: gnash-0.8.10-buffer-overflow.patch Patch3: gnash-0.8.10-boost_system.patch Patch4: gnash-0.8.10-docbook_fix.patch +# PATCH-FIX-UPSTREAM http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=27da938 +Patch5: gnash-config-plugindir.patch +Patch6: gnash-getopt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dejagnu BuildRequires: docbook-utils @@ -197,6 +200,8 @@ %if 0%{?suse_version} == 1230 %patch4 -p1 %endif +%patch5 -p1 +%patch6 -p1 %build # these are actually the default values, but this way they get added @@ -222,6 +227,7 @@ --enable-docbook \ --with-plugins-install=system \ --with-plugindir=%{_libdir}/mozilla/plugins \ + --with-kde4-plugindir=%{_libdir}/kde4 \ --enable-extensions=fileio,lirc,dejagnu,mysql make MAKEFLAGS=$MAKEFLAGS dumpconfig all LDFLAGS="-Wl,--build-id" ++++++ gnash-config-plugindir.patch ++++++ Index: gnash-0.8.10/configure =================================================================== --- gnash-0.8.10.orig/configure +++ gnash-0.8.10/configure @@ -30627,7 +30627,7 @@ if test "${with_kde4_plugindir+set}" = s fi if test x"${with_kde4_plugindir}" != x ; then - if test ! -d ${with_kde4_plugindir}/imageformats; then + if test ! -d ${with_kde4_plugindir}/plugins; then as_fn_error "${with_kde4_plugindir} directory doesn't contain any KDE 4.x plugins!" "$LINENO" 5 fi fi Index: gnash-0.8.10/macros/kde4.m4 =================================================================== --- gnash-0.8.10.orig/macros/kde4.m4 +++ gnash-0.8.10/macros/kde4.m4 @@ -49,7 +49,7 @@ AC_DEFUN([GNASH_PATH_KDE4], [Directory to install KDE 4.x plugin in]), with_kde4_plugindir=${withval}) if test x"${with_kde4_plugindir}" != x ; then - if test ! -d ${with_kde4_plugindir}/imageformats; then + if test ! -d ${with_kde4_plugindir}/plugins; then AC_MSG_ERROR([${with_kde4_plugindir} directory doesn't contain any KDE 4.x plugins!]) fi fi ++++++ gnash-getopt.patch ++++++ Index: gnash-0.8.10/gui/dump/dump.cpp =================================================================== --- gnash-0.8.10.orig/gui/dump/dump.cpp +++ gnash-0.8.10/gui/dump/dump.cpp @@ -119,7 +119,7 @@ DumpGui::init(int argc, char **argv[]) optind = 0; opterr = 0; - char c; + int c; while ((c = getopt(argc, *argv, "D:S:T:")) != -1) { if (c == 'D') { // Terminate if no filename is given. Index: gnash-0.8.10/gui/fb/fb.cpp =================================================================== --- gnash-0.8.10.orig/gui/fb/fb.cpp +++ gnash-0.8.10/gui/fb/fb.cpp @@ -291,7 +291,7 @@ FBGui::init(int argc, char *** argv) } // Let -j -k override "window" size - optind = 0; opterr = 0; char c; + optind = 0; opterr = 0; int c; while ((c = getopt (argc, *argv, "j:k:X:Y:")) != -1) { switch (c) { case 'j': -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
