[xvst] fix bundled qtsingleapplication
by Leigh Scott
commit 02b554329acd4f3e348ad743a668aa9b4e593e32
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 20 11:06:08 2016 +0100
fix bundled qtsingleapplication
fix_bundled_qtsingleapplication.patch | 11 +++++++++++
xvst.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/fix_bundled_qtsingleapplication.patch b/fix_bundled_qtsingleapplication.patch
new file mode 100644
index 0000000..5c025f8
--- /dev/null
+++ b/fix_bundled_qtsingleapplication.patch
@@ -0,0 +1,11 @@
+--- a/src/qtsingleapplication/src/qtlocalpeer.cpp
++++ b/src/qtsingleapplication/src/qtlocalpeer.cpp
+@@ -40,6 +40,7 @@
+
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
++#include <QDataStream>
+ #include <QTime>
+
+ #if defined(Q_OS_WIN)
+
diff --git a/xvst.spec b/xvst.spec
index 954a67e..2e0ae56 100644
--- a/xvst.spec
+++ b/xvst.spec
@@ -5,7 +5,7 @@
Summary: Downloading your favourite video clips from a lot of websites
Name: xvst
Version: 2.5.2
-Release: 4.%{gitdate}git%{shortcommit}%{?dist}
+Release: 5.%{gitdate}git%{shortcommit}%{?dist}
License: GPLv3+
URL: https://github.com/xVST/xVideoServiceThief
# wget https://github.com/xVST/xVideoServiceThief/archive/cbfafe49f7ba1c85d4dcf5...
@@ -19,6 +19,8 @@ Patch3: keezmovies.patch
Patch4: myvideo.patch
Patch5: sunporno.patch
Patch6: wat.tv.patch
+# You should remove the bundled qtsingleapplication
+Patch7: fix_bundled_qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
@@ -51,6 +53,7 @@ rm -rf src/rtmpdump
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# Fix path names and end-of-line encoding.
sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/%{name}|g" src/options.cpp
@@ -101,6 +104,9 @@ update-desktop-database &> /dev/null || :
%{_datadir}/%{name}/languages/*qm
%changelog
+* Wed Jul 20 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.5.2-5.20140804gitcbfafe4
+- fix bundled qtsingleapplication
+
* Sat Mar 21 2015 Martin Gansser <linux4martin(a)gmx.de> 2.5.2-4.20140804gitcbfafe4
- dropped macro %%find_lang because it doesn't work in this certain case
- dropped macro %%exclude from %%{_datadir}/%%{name}/languages/*qm
8 years, 4 months
[OpenEXR_Viewers-nonfree] Exclude Arm
by Leigh Scott
commit 74d1ac3424b244a1a43a32b34db2c5ca6d4f2950
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 20 08:56:03 2016 +0100
Exclude Arm
OpenEXR_Viewers-nonfree.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/OpenEXR_Viewers-nonfree.spec b/OpenEXR_Viewers-nonfree.spec
index 55d3641..aaf60a4 100644
--- a/OpenEXR_Viewers-nonfree.spec
+++ b/OpenEXR_Viewers-nonfree.spec
@@ -29,6 +29,7 @@ Source0: http://download.savannah.nongnu.org/releases/openexr/openexr_vie
# missing header from ^^, should be fixed/included in subsequent releases
Source1: namespaceAlias.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i686 x86_64
Patch1: openexr_viewers-2.0.1-dso.patch
# fix ftbfs due to missing header
8 years, 4 months
[OpenEXR_Viewers-nonfree] Revert "There is no Cg on ARM"
by Leigh Scott
commit 83e379d56c463cf3b09c1a0b1c0915063fe50aae
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 20 08:53:41 2016 +0100
Revert "There is no Cg on ARM"
This reverts commit f4f8979c96173e76a9144fb36dce55f6d6025856.
OpenEXR_Viewers-nonfree.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/OpenEXR_Viewers-nonfree.spec b/OpenEXR_Viewers-nonfree.spec
index 28ff053..55d3641 100644
--- a/OpenEXR_Viewers-nonfree.spec
+++ b/OpenEXR_Viewers-nonfree.spec
@@ -1,11 +1,7 @@
%global _default_patch_fuzz 2
# nVidia Cg toolkit is not free
-%ifarch armv7hl
-%define with_Cg 0
-%else
%define with_Cg 1
-%endif
%if %with_Cg
%define real_name OpenEXR_Viewers-nonfree
%define V_suffix -nonfree
8 years, 4 months
[OpenEXR_Viewers-nonfree/f23] readd dso patch as it's needed for ARM
by Leigh Scott
commit 80752c87de921b18565073e2961e7fcf9fe2f218
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 20 08:39:45 2016 +0100
readd dso patch as it's needed for ARM
OpenEXR_Viewers-nonfree.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/OpenEXR_Viewers-nonfree.spec b/OpenEXR_Viewers-nonfree.spec
index b9d34df..28ff053 100644
--- a/OpenEXR_Viewers-nonfree.spec
+++ b/OpenEXR_Viewers-nonfree.spec
@@ -85,7 +85,7 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n openexr_viewers-%{version}
-#%patch1 -p1 -b .dso
+%patch1 -p1 -b .dso
cp -n %{SOURCE1} exrdisplay/namespaceAlias.h
#patch2 -p1 -b .header
8 years, 4 months