[vlc/f28: 7/7] Merge branch 'master' into f28
by Leigh Scott
commit fb0bdfaa1145c97afad549985ab32b288f78b879
Merge: 06598eb 40b0378
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon May 28 16:47:51 2018 +0100
Merge branch 'master' into f28
sources | 2 +-
vlc.spec | 27 +++++++++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
---
6 years, 5 months
[vlc/f28] (7 commits) ...Merge branch 'master' into f28
by Leigh Scott
Summary of changes:
c3d5f5e... Remove previous hack (*)
58e4532... Readd lost patch (*)
75f8c6e... Rebuilt (*)
a3ddeb9... Switch to proper devel name (*)
904d849... Add preliminary work for vlc-3.x in el7 (*)
40b0378... Update to 3.0.3 (*)
fb0bdfa... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
6 years, 5 months
[vlc] Update to 3.0.3
by Leigh Scott
commit 40b0378fa8c814da0196204997ce6d5ee7d73d33
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon May 28 11:54:56 2018 +0100
Update to 3.0.3
sources | 2 +-
vlc.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 0410d35..d391171 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdca57018d772fd270b4243eab46f978 vlc-3.0.2.tar.xz
+cf01d4755c719fe1c8605ceb40d8f1d2 vlc-3.0.3.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 19fdaf4..0979eda 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -41,8 +41,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 3.0.2
-Release: 3%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -564,6 +564,9 @@ fi || :
%changelog
+* Mon May 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-1
+- Update to 3.0.3
+
* Mon May 14 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.2-3
- Rebuilt
6 years, 5 months
[dwarffortress] Actually update to latest upstream release.
by Ben Rosser
commit 95cf47dd8a635df763835d1c465e878a32ceeea5
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Thu May 24 14:35:03 2018 -0400
Actually update to latest upstream release.
.gitignore | 3 +++
dwarffortress.spec | 8 ++++----
sources | 6 +++---
3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 249e9f1..207dec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@
/0.44.09.zip
/df_44_09_linux32.tar.bz2
/df_44_09_linux.tar.bz2
+/0.44.10.zip
+/df_44_10_linux32.tar.bz2
+/df_44_10_linux.tar.bz2
diff --git a/dwarffortress.spec b/dwarffortress.spec
index 58aa43a..2ce89d1 100644
--- a/dwarffortress.spec
+++ b/dwarffortress.spec
@@ -4,7 +4,7 @@
%global __strip /bin/true
Name: dwarffortress
-Version: 0.44.09
+Version: 0.44.10
Release: 1%{?dist}
Summary: A single-player procedurally generated fantasy game
@@ -13,8 +13,8 @@ License: Dwarf Fortress
URL: http://www.bay12games.com/dwarves/
# Due to pre-compiled stuff, there is a separate 32 and 64 bit architecture.
-Source0: http://www.bay12games.com/dwarves/df_44_09_linux.tar.bz2
-Source1: http://www.bay12games.com/dwarves/df_44_09_linux32.tar.bz2
+Source0: http://www.bay12games.com/dwarves/df_44_10_linux.tar.bz2
+Source1: http://www.bay12games.com/dwarves/df_44_10_linux32.tar.bz2
# The libgraphics sources, as maintained by the Arch Linux packager.
Source2: https://github.com/svenstaro/dwarf_fortress_unfuck/archive/%{version}.zip
@@ -140,7 +140,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/dwarffortress.appdata.xml
%changelog
-* Thu May 24 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.09-1
+* Thu May 24 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.10-1
- Updated to latest upstream version, 0.44.10.
- Add the launcher files separately as individual sources, not a tarball.
- Fix a bug in the desktop file.
diff --git a/sources b/sources
index 6ab7947..5323f30 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-08529be5c2d98ec493899f854efb5b9f 0.44.09.zip
-82d22c02ddb02bcd2554210220d0761f df_44_09_linux32.tar.bz2
-9acaa317dd936e809d880aea9682fabe df_44_09_linux.tar.bz2
+570e0c44d5943c480044fee2b7ca3611 0.44.10.zip
+133fe13cfb2572cf38cd0d42d47b1766 df_44_10_linux32.tar.bz2
+097f2e0cc6b8954033ecf89bc52b7f82 df_44_10_linux.tar.bz2
6 years, 6 months
[dwarffortress] Update to latest upstream release.
by Ben Rosser
commit e1407d76f5138d642002833720020a1fadd1248f
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Thu May 24 14:32:39 2018 -0400
Update to latest upstream release.
dwarffortress | 23 +++++++++++++++++++++++
dwarffortress.desktop | 10 ++++++++++
dwarffortress.png | Bin 0 -> 4647 bytes
dwarffortress.spec | 30 +++++++++++++++++++++++-------
sources | 1 -
5 files changed, 56 insertions(+), 8 deletions(-)
---
diff --git a/dwarffortress b/dwarffortress
new file mode 100755
index 0000000..6945757
--- /dev/null
+++ b/dwarffortress
@@ -0,0 +1,23 @@
+#!/bin/sh
+export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
+#export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing.
+
+pkgname=dwarffortress
+prefix=/usr
+
+if [[ ! -d "$HOME/.$pkgname" ]]; then
+ mkdir -p "$HOME/.$pkgname/data"
+ ln -s ${prefix}/share/"$pkgname"/raw "$HOME/.$pkgname/raw"
+ ln -s ${prefix}/libexec/"$pkgname" "$HOME/.$pkgname/libs"
+ cp -rn ${prefix}/share/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
+fi
+
+if [[ ! -f "$HOME/.dwarffortress/.stockpile" ]]; then
+ for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
+ cp -r ${prefix}/share/"$pkgname"/data/$link "$HOME/.$pkgname/data/$link"
+ done
+fi
+
+cd "$HOME/.$pkgname"
+exec ./libs/Dwarf_Fortress "$@"
+
diff --git a/dwarffortress.desktop b/dwarffortress.desktop
new file mode 100644
index 0000000..573baf9
--- /dev/null
+++ b/dwarffortress.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Dwarf Fortress
+GenericName=Dwarf Fortress
+Comment=A single-player fantasy game.
+Exec=dwarffortress
+Icon=/usr/share/pixmaps/dwarffortress.png
+Terminal=false
+Type=Application
+Categories=Game;
+StartupWMClass=Dwarf_Fortress
diff --git a/dwarffortress.png b/dwarffortress.png
new file mode 100644
index 0000000..97c864f
Binary files /dev/null and b/dwarffortress.png differ
diff --git a/dwarffortress.spec b/dwarffortress.spec
index f5dd85b..58aa43a 100644
--- a/dwarffortress.spec
+++ b/dwarffortress.spec
@@ -11,13 +11,25 @@ Summary: A single-player procedurally generated fantasy game
License: Dwarf Fortress
URL: http://www.bay12games.com/dwarves/
+
+# Due to pre-compiled stuff, there is a separate 32 and 64 bit architecture.
Source0: http://www.bay12games.com/dwarves/df_44_09_linux.tar.bz2
Source1: http://www.bay12games.com/dwarves/df_44_09_linux32.tar.bz2
+
+# The libgraphics sources, as maintained by the Arch Linux packager.
Source2: https://github.com/svenstaro/dwarf_fortress_unfuck/archive/%{version}.zip
-Source3: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dwarffortress-lau...
+
+# Desktop file.
+Source3: dwarffortress.desktop
# Appstream file.
-Source4: https://www.acm.jhu.edu/~bjr/fedora/dwarffortress/rpmfusion/dwarffortress...
+Source4: dwarffortress.appdata.xml
+
+# Launcher script.
+Source5: dwarffortress
+
+# Icon.
+Source6: dwarffortress.png
# Only build for 32 and 64 bit x86 systems.
# (According to kwizart, just use i686 here).
@@ -79,7 +91,6 @@ tar xfj %SOURCE1
# Extract other sources.
cd df_linux/
unzip -qo %SOURCE2
-tar xfJ %SOURCE3
# Fix some permissions.
find -type d -exec chmod 755 {} +
@@ -108,10 +119,10 @@ strip %{buildroot}%{_libexecdir}/dwarffortress/libgraphics.so
# Install .desktop file and launcher script from Arch Linux package.
# Or, rather, the modified versions.
-sed 's|prefix=/usr|prefix=%{_prefix}|' -i dwarffortress-launcher/dwarffortress
-install -p -Dm755 dwarffortress-launcher/dwarffortress %{buildroot}%{_bindir}/dwarffortress
-install -p -Dm644 dwarffortress-launcher/dwarffortress.desktop %{buildroot}%{_datadir}/applications/dwarffortress.desktop
-install -p -Dm644 dwarffortress-launcher/dwarffortress.png %{buildroot}%{_datadir}/pixmaps/dwarffortress.png
+install -p -Dm755 %SOURCE5 %{buildroot}%{_bindir}/dwarffortress
+sed 's|prefix=/usr|prefix=%{_prefix}|' -i %{buildroot}%{_bindir}/dwarffortress
+install -p -Dm644 %SOURCE3 %{buildroot}%{_datadir}/applications/dwarffortress.desktop
+install -p -Dm644 %SOURCE6 %{buildroot}%{_datadir}/pixmaps/dwarffortress.png
desktop-file-validate %{buildroot}%{_datadir}/applications/dwarffortress.desktop
# Install appdata file and validate it.
@@ -129,6 +140,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/dwarffortress.appdata.xml
%changelog
+* Thu May 24 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.09-1
+- Updated to latest upstream version, 0.44.10.
+- Add the launcher files separately as individual sources, not a tarball.
+- Fix a bug in the desktop file.
+
* Mon Apr 09 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.09-1
- Update to latest upstream release.
diff --git a/sources b/sources
index 72124e7..6ab7947 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-df7f7f5f00c918504c3fa2147566154f dwarffortress-launcher.tar.xz
08529be5c2d98ec493899f854efb5b9f 0.44.09.zip
82d22c02ddb02bcd2554210220d0761f df_44_09_linux32.tar.bz2
9acaa317dd936e809d880aea9682fabe df_44_09_linux.tar.bz2
6 years, 6 months
[xpra-codecs-freeworld/f27: 3/3] Update to 2.3
by Antonio
commit b8bfe504d0f95ac10bfa4d099170d4873ebd38e9
Merge: 9d42428 b0fe7aa
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed May 23 18:06:04 2018 +0200
Update to 2.3
.gitignore | 2 +
sources | 2 +-
xpra-codecs-freeworld-ffmpeg35.patch | 173 -----------------------------------
xpra-codecs-freeworld.spec | 50 +++++-----
4 files changed, 28 insertions(+), 199 deletions(-)
---
6 years, 6 months
[qt5-qtwebengine-freeworld] Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686
by Kevin Kofler
commit 28132e7191db565999c64ca9cb60722a3e1f4825
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Tue May 22 00:19:56 2018 +0200
Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686
qt5-qtwebengine-freeworld.spec | 7 +++++++
qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch | 18 ++++++++++++++++++
2 files changed, 25 insertions(+)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index a159b7e..d7bee1a 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -97,6 +97,11 @@ Patch21: qtwebengine-everywhere-src-5.10.0-gn-bootstrap-verbose.patch
# https://codereview.qt-project.org/#/c/196922/
# see QTBUG-60886 and QTBUG-65090
Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch
+# Fix FTBFS with GCC 8 on i686: GCC8 has changed the alignof operator to return
+# the minimal alignment required by the target ABI instead of the preferred
+# alignment. This means int64_t is now 4 on i686 (instead of 8). Use __alignof__
+# to get the value we expect (and chromium checks for). Patch by spot.
+Patch23: qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
## Upstream patches:
# drop support for obsolete Unicode "aspirational scripts" (dropped in UTS 31),
# fixes #error with ICU >= 60 (which was a reminder to double-check the list)
@@ -341,6 +346,7 @@ This version is compiled with support for patent-encumbered codecs enabled.
%patch12 -p1 -b .webrtc-neon-detect
%patch21 -p1 -b .gn-bootstrap-verbose
%patch22 -p1 -b .icu59
+%patch23 -p1 -b .gcc8
%patch100 -p1 -b .no-aspirational-scripts
%patch101 -p1 -b .security-5.9.5
%patch102 -p1 -b .CVE-2018-6033
@@ -431,6 +437,7 @@ echo "%{_libdir}/%{name}" \
%changelog
* Mon May 21 2018 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.10.1-5
- Use the FFmpeg 4 patch from Arch Linux, the previous one crashed (rh#1563446)
+- Add patch by spot from the Fedora Chromium RPM for FTBFS with GCC 8 on i686
* Sun Mar 18 2018 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.10.1-4
- Fix (from 5.9.5) for incomplete, ineffective fix for CVE-2018-6033 in 5.10.1
diff --git a/qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch b/qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
new file mode 100644
index 0000000..ff007b7
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
@@ -0,0 +1,18 @@
+diff -up qtwebengine-everywhere-src-5.10.1/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof qtwebengine-everywhere-src-5.10.1/src/3rdparty/chromium/mojo/public/c/system/macros.h
+--- qtwebengine-everywhere-src-5.10.1/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof 2018-05-15 14:58:46.448912634 -0400
++++ qtwebengine-everywhere-src-5.10.1/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400
+@@ -18,7 +18,13 @@
+ #endif
+
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
6 years, 6 months
