[xvst] Update to recent git version 3.0-7.20180822git3ae2797
by Martin Gansser
commit 5169997a00c5d83fdb66353ebeae31252ce966aa
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Aug 25 21:20:20 2019 +0200
Update to recent git version 3.0-7.20180822git3ae2797
.gitignore | 1 +
InformationLogo.png | Bin 0 -> 8648 bytes
sources | 2 +-
xVideoServiceThief.patch | 24 ++++++++++++++++++++++++
xvst.spec | 18 ++++++++++++------
5 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70810e6..db2306c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xvst-2.5.2-cbfafe4.tar.gz
/xvst-2.6-73d3f51.tar.gz
/xvst-3.0-14dee45.tar.gz
+/xvst-3.0-3ae2797.tar.gz
diff --git a/InformationLogo.png b/InformationLogo.png
new file mode 100644
index 0000000..e95f105
Binary files /dev/null and b/InformationLogo.png differ
diff --git a/sources b/sources
index 0c9e422..d8e224d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36d1cf49f5a51443088dbeae420046ff xvst-3.0-14dee45.tar.gz
+3c8d5f952a37ac6165e107a89bf289fb xvst-3.0-3ae2797.tar.gz
diff --git a/xVideoServiceThief.patch b/xVideoServiceThief.patch
new file mode 100644
index 0000000..d41fcc5
--- /dev/null
+++ b/xVideoServiceThief.patch
@@ -0,0 +1,24 @@
+--- xVideoServiceThief-3ae2797b086469d73d7eea22992c9ade017a50c8/src/forms/dragdropimpl.cpp.orig 2018-08-22 03:00:15.000000000 +0200
++++ xVideoServiceThief-3ae2797b086469d73d7eea22992c9ade017a50c8/src/forms/dragdropimpl.cpp 2019-05-31 13:04:49.697051634 +0200
+@@ -37,14 +37,14 @@
+ {
+ setupUi(this);
+ // create drag and drop image
+- //imgDragDrop = new QLabelClickeable(this);
+- //imgDragDrop->setObjectName(QString::fromUtf8("imgDragDrop"));
+- //imgDragDrop->setGeometry(QRect(0, 0, 120, 80));
+- //imgDragDrop->setAcceptDrops(true);
+- //imgDragDrop->setPixmap(QPixmap(":/header/images/DragDropWindow.svg"));
+- //imgDragDrop->setAlignment(Qt::AlignCenter);
++ imgDragDrop = new QLabelClickeable(this);
++ imgDragDrop->setObjectName(QString::fromUtf8("imgDragDrop"));
++ imgDragDrop->setGeometry(QRect(0, 0, 120, 80));
++ imgDragDrop->setAcceptDrops(true);
++ imgDragDrop->setPixmap(QPixmap(":/header/images/DragDropWindow.svg"));
++ imgDragDrop->setAlignment(Qt::AlignCenter);
+ // connect doubleClick signal
+- connect(btnDragDrop, SIGNAL(triggered(QAction*)), this, SLOT(displayMainWindowClicked())); // on double click, display main window
++ connect(imgDragDrop, SIGNAL(triggered(QAction*)), this, SLOT(displayMainWindowClicked())); // on double click, display main window
+ // save the parent window
+ this->parent = parent;
+ this->programOptions = programOptions;
diff --git a/xvst.spec b/xvst.spec
index cc59d30..81666b3 100644
--- a/xvst.spec
+++ b/xvst.spec
@@ -1,17 +1,18 @@
-# https://github.com/xVST/xVideoServiceThief/commit/14dee4551645f6e23000c49...
-%global commit 14dee4551645f6e23000c497f5c17631de98a368
+# https://github.com/xVST/xVideoServiceThief/commit/3ae2797b086469d73d7eea2...
+%global commit 3ae2797b086469d73d7eea22992c9ade017a50c8
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20171201
+%global gitdate 20180822
%global rname xVST
Summary: Downloading your favourite video clips from a lot of websites
Name: xvst
Version: 3.0
-Release: 6.%{gitdate}git%{shortcommit}%{?dist}
+Release: 7.%{gitdate}git%{shortcommit}%{?dist}
License: GPLv3+
-URL: http://www.xvideothief.com
+URL: https://www.xvideothief.com
Source0: https://github.com/xVST/xVideoServiceThief/archive/%{commit}/%{name}-%{ve...
Source1: %{name}.desktop
+Source2: InformationLogo.png
Patch0: beeg.patch
Patch1: chilloutzone.patch
@@ -20,6 +21,7 @@ Patch3: keezmovies.patch
Patch4: myvideo.patch
Patch5: sunporno.patch
Patch6: wat.tv.patch
+Patch7: xVideoServiceThief.patch
ExcludeArch: ppc64 ppc64le
@@ -56,6 +58,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
@@ -84,7 +87,7 @@ install -m 0644 resources/translations/definitions/*.language \
%{buildroot}%{_datadir}/%{name}/languages
install -Dm755 bin/%{name} %{buildroot}%{_bindir}/%{name}
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -Dm644 resources/images/InformationLogo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -107,6 +110,9 @@ update-desktop-database &> /dev/null || :
%{_datadir}/%{name}/languages/*qm
%changelog
+* Sun Aug 25 2019 Martin Gansser <linux4martin(a)gmx.de> 3.0-7.20180822git3ae2797
+- Update to recent git version 3.0-7.20180822git3ae2797
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.0-6.20171201git14dee45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
5 years, 3 months
[deepin-movie] Update to 3.2.24.3
by Zamir SUN
commit d72227bc11ab42ffac08a8637a432a6bc155493e
Author: Zamir SUN <sztsian(a)gmail.com>
Date: Sun Aug 25 11:51:02 2019 +0800
Update to 3.2.24.3
Signed-off-by: Zamir SUN <sztsian(a)gmail.com>
.gitignore | 1 +
deepin-movie.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5443754..a664acb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/deepin-movie-3.2.14.tar.gz
+/deepin-movie-3.2.24.3.tar.gz
diff --git a/deepin-movie.spec b/deepin-movie.spec
index 6b2b0ff..61b4230 100644
--- a/deepin-movie.spec
+++ b/deepin-movie.spec
@@ -1,6 +1,6 @@
Name: deepin-movie
-Version: 3.2.14
-Release: 3%{?dist}
+Version: 3.2.24.3
+Release: 1%{?dist}
Summary: Deepin movie based on mpv
Summary(zh_CN): 深度影音
License: GPLv3
@@ -85,6 +85,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_libdir}/libdmr.so
%changelog
+* Sun Aug 25 2019 Zamir SUN <zsun(a)fedoraproject.org> - 3.2.24.3-1
+- Update to 3.2.24.3
+
* Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.14-3
- Rebuild for new ffmpeg version
diff --git a/sources b/sources
index f7f704a..2ffedcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c415bd85eb9d97c1ac964c73f2a861bb deepin-movie-3.2.14.tar.gz
+c63093e86ab5ee34ccb6a23b495b42bf deepin-movie-3.2.24.3.tar.gz
5 years, 3 months
[deepin-music] Remove duplicated translation files
by Zamir SUN
commit 976afc73be49f239bb0d7710cfb24551629b5af8
Author: Zamir SUN <sztsian(a)gmail.com>
Date: Sun Aug 25 09:24:03 2019 +0800
Remove duplicated translation files
Signed-off-by: Zamir SUN <sztsian(a)gmail.com>
deepin-music.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/deepin-music.spec b/deepin-music.spec
index d3d2a96..8ad18af 100644
--- a/deepin-music.spec
+++ b/deepin-music.spec
@@ -1,6 +1,6 @@
Name: deepin-music
Version: 5.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Deepin Music Player
Summary(zh_CN): 深度音乐播放器
License: GPLv3
@@ -61,6 +61,7 @@ export PATH=%{_qt5_bindir}:$PATH
%install
%make_install INSTALL_ROOT=%{buildroot}
install -pDm644 %{S:1} %{buildroot}/%{_metainfodir}/%{name}.appdata.xml
+rm %{buildroot}/%{_datadir}/translations -rf
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -73,6 +74,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appda
%{_libdir}/lib*.so
%{_libdir}/lib*.so.*
%{_datadir}/%{name}
+%{_datadir}/%{name}/*
%{_datadir}/dman/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -80,6 +82,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appda
%changelog
+* Sun Aug 25 2019 Zamir SUN <sztsian(a)gmail.com> 5.0.1-2
+- Remove duplicated translation files in /usr/share/translations/
+
* Sat Aug 17 2019 Zamir SUN <sztsian(a)gmail.com> 5.0.1-1
- Update to 5.0.1
5 years, 3 months