[wormsofprey] Fix building with gcc6 / fix FTBFS
by jwrdegoede
commit 93a489d92b092e0c03785d0233f10ed0d42fdb16
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jul 7 21:41:10 2016 +0200
Fix building with gcc6 / fix FTBFS
wop-0.4.3-gcc6.patch | 18 ++++++++++++++++++
wormsofprey.spec | 28 +++++++++++++---------------
2 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/wop-0.4.3-gcc6.patch b/wop-0.4.3-gcc6.patch
new file mode 100644
index 0000000..28db046
--- /dev/null
+++ b/wop-0.4.3-gcc6.patch
@@ -0,0 +1,18 @@
+diff -up wop-0.4.3/src/global.cpp~ wop-0.4.3/src/global.cpp
+--- wop-0.4.3/src/global.cpp~ 2005-07-21 09:56:31.000000000 +0200
++++ wop-0.4.3/src/global.cpp 2016-07-07 21:39:23.547293019 +0200
+@@ -44,10 +44,10 @@
+ #define GREEN(s) s
+ #define RED(s) s
+ #else
+-#define BLACK(s) "\033[0;1m"s"\033[0m"
+-#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m"s"\033[0m"
+-#define GREEN(s) "\033[32m"s"\033[0m"
+-#define RED(s) "\033[31m"s"\033[0m"
++#define BLACK(s) "\033[0;1m" s "\033[0m"
++#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m" s "\033[0m"
++#define GREEN(s) "\033[32m" s "\033[0m"
++#define RED(s) "\033[31m" s "\033[0m"
+ #endif
+
+ /**********************************************************/
diff --git a/wormsofprey.spec b/wormsofprey.spec
index 3e04812..9761179 100644
--- a/wormsofprey.spec
+++ b/wormsofprey.spec
@@ -1,6 +1,6 @@
Name: wormsofprey
Version: 0.4.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Team based bomb / scorched like game
Group: Amusements/Games
License: GPLv2+
@@ -9,7 +9,7 @@ Source0: http://wormsofprey.org/download/wop-%{version}-src.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: wop-0.4.3-gcc43.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: wop-0.4.3-gcc6.patch
BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel
BuildRequires: zlib-devel imake desktop-file-utils
Requires: %{name}-data >= 20051221
@@ -26,6 +26,7 @@ and Multiple moving goals.
%prep
%setup -q -n wop-%{version}
%patch0 -p1
+%patch1 -p1
sed -i 's|^CXXFLAGS ?= .*|CXXFLAGS ?= %{optflags}|' sdlwidgets/Makefile \
src/Makefile
sed -i 's|data = ./data|data = %{_datadir}/%{name}|' woprc
@@ -40,7 +41,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -57,25 +57,20 @@ install -p -m 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README README-COMMAND-LINE-OPTIONS.txt REVIEWS
%config(noreplace) %{_sysconfdir}/woprc
%{_bindir}/%{name}
@@ -85,6 +80,9 @@ fi
%changelog
+* Thu Jul 7 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.4.3-10
+- Fix building with gcc6 / fix FTBFS
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.4.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8 years, 4 months
[VirtualBox-kmod/f23] Build only akmods
by Sérgio M. Basto
commit 7522b164268a76a7ce474c51855cce646c376287
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 7 20:40:59 2016 +0100
Build only akmods
VirtualBox-kmod.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c99a93a..c3b8ccd 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -3,7 +3,8 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels akmod
+%global debug_package %{nil}
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -22,7 +23,7 @@
Name: VirtualBox-kmod
Version: 5.0.24
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -100,6 +101,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Thu Jul 07 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.24-2
+- Build only akmods
+
* Wed Jun 29 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.24-1
- Update VirtualBox to 5.0.24
- No more obsolete VirtualBox-OSE , simplify snippets
8 years, 4 months
[VirtualBox-kmod/f23] try global buildforkernels newest
by Sérgio M. Basto
commit 58bc7336fdf342997bc3316e76e638fbb6c346df
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 7 20:30:43 2016 +0100
try global buildforkernels newest
VirtualBox-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 9460c97..c99a93a 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#global buildforkernels newest
+%global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
8 years, 4 months
[vbam] Fix building with gcc6 / fix FTBFS
by jwrdegoede
commit 4a32a67bb4fb36fdfb427a09c60d83a589b09ab3
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jul 7 21:24:47 2016 +0200
Fix building with gcc6 / fix FTBFS
vbam-1.8.0.1229-gcc6.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
vbam.spec | 7 ++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/vbam-1.8.0.1229-gcc6.patch b/vbam-1.8.0.1229-gcc6.patch
new file mode 100644
index 0000000..071c0f9
--- /dev/null
+++ b/vbam-1.8.0.1229-gcc6.patch
@@ -0,0 +1,42 @@
+diff -up vbam-1.8.0.1229/fex/fex/blargg_common.h~ vbam-1.8.0.1229/fex/fex/blargg_common.h
+--- vbam-1.8.0.1229/fex/fex/blargg_common.h~ 2014-04-05 18:22:07.000000000 +0200
++++ vbam-1.8.0.1229/fex/fex/blargg_common.h 2016-07-07 21:08:00.998100478 +0200
+@@ -12,7 +12,7 @@
+ typedef const char* blargg_err_t; // 0 on success, otherwise error string
+
+ // Success; no error
+-int const blargg_ok = 0;
++const blargg_err_t blargg_ok = NULL;
+
+ // BLARGG_RESTRICT: equivalent to C99's restrict, where supported
+ #if __GNUC__ >= 3 || _MSC_VER >= 1100
+diff -up vbam-1.8.0.1229/src/sdl/expr.cpp~ vbam-1.8.0.1229/src/sdl/expr.cpp
+--- vbam-1.8.0.1229/src/sdl/expr.cpp~ 2014-04-05 18:22:07.000000000 +0200
++++ vbam-1.8.0.1229/src/sdl/expr.cpp 2016-07-07 21:17:18.145720777 +0200
+@@ -90,12 +90,10 @@
+ /* Copy the first part of user declarations. */
+ #line 1 "expr.ypp"
+
+-namespace std {
+ #include <stdio.h>
+ #include <memory.h>
+ #include <stdlib.h>
+ #include <string.h>
+-}
+
+ using namespace std;
+
+diff -up vbam-1.8.0.1229/src/sdl/expr.ypp~ vbam-1.8.0.1229/src/sdl/expr.ypp
+--- vbam-1.8.0.1229/src/sdl/expr.ypp~ 2014-04-05 18:22:07.000000000 +0200
++++ vbam-1.8.0.1229/src/sdl/expr.ypp 2016-07-07 21:14:14.865529840 +0200
+@@ -1,10 +1,8 @@
+ %{
+-namespace std {
+ #include <stdio.h>
+ #include <memory.h>
+ #include <stdlib.h>
+ #include <string.h>
+-}
+
+ using namespace std;
+
diff --git a/vbam.spec b/vbam.spec
index f969c54..cae7f75 100644
--- a/vbam.spec
+++ b/vbam.spec
@@ -1,7 +1,7 @@
Name: vbam
#Pre-release version 1.8.0.1228 is a snapshot of svn 1229
Version: 1.8.0.1229
-Release: 2%{?dist}
+Release: 3%{?dist}
#Will not create a binary vbam package, only vbam-gtk and vbam-sdl subpackages
Summary: High compatibility Gameboy Advance Emulator combining VBA developments
@@ -13,6 +13,7 @@ Url: http://www.vba-m.com
Source: vbam-%{version}.tar.xz
#Kudos to Michael Schwendt and Hans de Goede (updates paths for compat-SFML16-devel):
Patch0: %{name}-%{version}-includedir.patch
+Patch1: %{name}-%{version}-gcc6.patch
BuildRequires: SDL-devel
BuildRequires: zip
BuildRequires: ImageMagick
@@ -83,6 +84,7 @@ Advance project, with many improvements from various developments of VBA.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#Typos in desktop file:
#https://sourceforge.net/p/vbam/bugs/159/
@@ -137,6 +139,9 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Jul 7 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.8.0.1229-3
+- Fix building with gcc6 / fix FTBFS
+
* Mon Jan 12 2015 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.8.0.1229-2
- Fix typo in desktop file
8 years, 4 months
[avidemux] More tweaks to the gcc 6 patch.
by Richard Shaw
commit 7dcb568e055c0bf28e741fd6ff1f0d3b071eecde
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Thu Jul 7 14:24:32 2016 -0500
More tweaks to the gcc 6 patch.
avidemux-2.6.12-gcc6.patch | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/avidemux-2.6.12-gcc6.patch b/avidemux-2.6.12-gcc6.patch
index 451a22f..1488448 100644
--- a/avidemux-2.6.12-gcc6.patch
+++ b/avidemux-2.6.12-gcc6.patch
@@ -9,12 +9,20 @@
codecId=codecid; \
_context = avcodec_alloc_context3 (codec);\
ADM_assert (_context);\
-@@ -213,7 +213,7 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_
+@@ -212,13 +212,13 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_
+ \
if (avcodec_open2(_context, codec, NULL) < 0) \
{ \
- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
+- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
- GUI_Error_HIG("Codec","Internal error opening "display); \
++ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \
+ GUI_Error_HIG("Codec","Internal error opening " display); \
ADM_assert(0); \
} \
else \
+ { \
+- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
++ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \
+ } \
+ }
+
8 years, 4 months
[guvcview/f23] Remove rpath.
by Thomas Moschny
Summary of changes:
cffb88b... Remove rpath. (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[avidemux] Update gcc 6 patch.
by Richard Shaw
commit dac87568bee51563500e9e7c38c89611c4e80525
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Thu Jul 7 12:23:57 2016 -0500
Update gcc 6 patch.
avidemux-2.6.12-gcc6.patch | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/avidemux-2.6.12-gcc6.patch b/avidemux-2.6.12-gcc6.patch
index 8a1e2d2..451a22f 100644
--- a/avidemux-2.6.12-gcc6.patch
+++ b/avidemux-2.6.12-gcc6.patch
@@ -1,5 +1,14 @@
--- a/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
+++ b/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
+@@ -182,7 +182,7 @@ ADM_COREVIDEOCODEC6_EXPORT void ADM_lavD
+ #define WRAP_Open_Template(funcz,argz,display,codecid,extra) \
+ {\
+ AVCodec *codec=funcz(argz);\
+-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
++if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
+ codecId=codecid; \
+ _context = avcodec_alloc_context3 (codec);\
+ ADM_assert (_context);\
@@ -213,7 +213,7 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_
if (avcodec_open2(_context, codec, NULL) < 0) \
{ \
8 years, 4 months
