[dvdstyler] Let try compat-wxGTK3-gtk2, rfbz#4267

Sérgio M. Basto sergiomb at rpmfusion.org
Tue Sep 27 10:10:39 CEST 2016


commit 8158d14c069cc95bc5429d540609fbba324a31dc
Author: Sérgio M. Basto <sergio at serjux.com>
Date:   Tue Sep 27 09:08:54 2016 +0100

    Let try compat-wxGTK3-gtk2, rfbz#4267

 dvdstyler-wxwin.m4.patch | 27 +++++++++++++++++++++++++++
 dvdstyler.spec           | 15 ++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/dvdstyler-wxwin.m4.patch b/dvdstyler-wxwin.m4.patch
new file mode 100644
index 0000000..02b11aa
--- /dev/null
+++ b/dvdstyler-wxwin.m4.patch
@@ -0,0 +1,27 @@
+--- ./wxwin.m4.org	2016-09-27 07:44:11.968104125 +0100
++++ ./wxwin.m4	2016-09-27 07:45:28.972906202 +0100
+@@ -181,18 +181,18 @@ AC_DEFUN([WX_CONFIG_CHECK],
+ 
+     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+     wx_config_major_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_config_minor_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_config_micro_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     wx_requested_major_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_requested_minor_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_requested_micro_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                               [$wx_requested_minor_version],
diff --git a/dvdstyler.spec b/dvdstyler.spec
index d493929..7c6848a 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -4,21 +4,22 @@
 Name:           dvdstyler
 Epoch:          1
 Version:        3.0.2
-Release:        2%{?prerel_real}%{?dist}
+Release:        3%{?prerel_real}%{?dist}
 Summary:        Cross-platform DVD authoring application
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.dvdstyler.de/
 Source0:        http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}.tar.bz2
+Patch1:         dvdstyler-wxwin.m4.patch
 # build
 BuildRequires:  automake autoconf
 BuildRequires:  gettext
 BuildRequires:  byacc
 # libraries
-BuildRequires:  wxGTK3-devel >= 2.8.7
+BuildRequires:  compat-wxGTK3-gtk2-devel >= 2.8.7
 # wxsvg version with wxGTK3
-BuildRequires:  wxsvg-devel >= 1.5.9-2
+BuildRequires:  wxsvg-devel >= 1.5.9-4
 BuildRequires:  ffmpeg-devel
 BuildRequires:  ffmpeg
 #BuildRequires:  libgnomeui-devel
@@ -42,7 +43,7 @@ Requires:       dvdauthor
 Requires:       mjpegtools
 Requires:       mkisofs
 # wxsvg version with wxGTK3
-Requires:       wxsvg >= 1.5.9-2
+Requires:       wxsvg >= 1.5.9-4
 # note: do not add Require: totem-backend or another DVD player - see
 # RPM Fusion bug 366 for more details
 
@@ -54,6 +55,7 @@ create navigational DVD menus similar to those found on most commercial DVDs.
 
 %prep
 %setup -q -n DVDStyler-%{version}%{?prerel}
+%patch1 -p1
 #{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
 
 %build
@@ -62,7 +64,7 @@ touch NEWS
 #./autogen.sh
 autoreconf -i
 %configure \
-  --disable-dependency-tracking --with-wx-config=/usr/bin/wx-config-3.0
+  --disable-dependency-tracking --with-wx-config=/usr/bin/wx-config-3.0-gtk2
 # docs folder is not smp_mflags safe
 make -C docs
 %make_build
@@ -92,6 +94,9 @@ desktop-file-install \
 %{_mandir}/*/*.gz
 
 %changelog
+* Tue Sep 27 2016 Sérgio Basto <sergio at serjux.com> - 1:3.0.2-3
+- Let try compat-wxGTK3-gtk2, rfbz#4267
+
 * Wed Sep 21 2016 Sérgio Basto <sergio at serjux.com> - 1:3.0.2-2
 - Be sure that compiles with wxsvg-devel-1.5.9-2
 


More information about the rpmfusion-commits mailing list