From 923d98a8efa5e3da63f607efc9f6c1f5934f0cdb Mon Sep 17 00:00:00 2001 From: Kenneth Chan Date: Sat, 8 Jul 2023 09:26:26 +0700 Subject: desktop/variety: Updated for version 0.8.10. Signed-off-by: Willy Sudiarto Raharjo --- desktop/variety/disable-panoramio.patch | 47 --------------------------------- desktop/variety/fix-valueerror.patch | 11 -------- desktop/variety/variety.SlackBuild | 16 ++++------- desktop/variety/variety.info | 14 +++++----- 4 files changed, 12 insertions(+), 76 deletions(-) delete mode 100644 desktop/variety/disable-panoramio.patch delete mode 100644 desktop/variety/fix-valueerror.patch (limited to 'desktop/variety') diff --git a/desktop/variety/disable-panoramio.patch b/desktop/variety/disable-panoramio.patch deleted file mode 100644 index 641119859e92..000000000000 --- a/desktop/variety/disable-panoramio.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur variety-0.6.3.orig/variety/PreferencesVarietyDialog.py variety-0.6.3/variety/PreferencesVarietyDialog.py ---- variety-0.6.3.orig/variety/PreferencesVarietyDialog.py 2016-11-01 19:59:39.000000000 +0100 -+++ variety-0.6.3/variety/PreferencesVarietyDialog.py 2017-01-25 21:53:29.419376574 +0100 -@@ -32,7 +32,6 @@ - from variety.AddFlickrDialog import AddFlickrDialog - from variety.AddMediaRssDialog import AddMediaRssDialog - from variety.AddRedditDialog import AddRedditDialog --from variety.AddPanoramioDialog import AddPanoramioDialog - from variety.EditFavoriteOperationsDialog import EditFavoriteOperationsDialog - from variety.SmartFeaturesConfirmationDialog import SmartFeaturesConfirmationDialog - from variety.LoginOrRegisterDialog import LoginOrRegisterDialog -@@ -64,7 +63,6 @@ - EDITABLE_TYPES = [ - Options.SourceType.FLICKR, - Options.SourceType.MEDIA_RSS, -- Options.SourceType.PANORAMIO, - Options.SourceType.WALLHAVEN, - Options.SourceType.REDDIT, - ] -@@ -381,7 +379,6 @@ - '-', - (_("Flickr"), self.on_add_flickr_clicked), - (_("Wallhaven.cc"), self.on_add_wallhaven_clicked), -- (_("Panoramio"), self.on_add_panoramio_clicked), - (_("Reddit"), self.on_add_reddit_clicked), - (_("Media RSS"), self.on_add_mediarss_clicked), - ] -@@ -672,8 +669,6 @@ - self.dialog = AddRedditDialog() - elif type == Options.SourceType.MEDIA_RSS: - self.dialog = AddMediaRssDialog() -- elif type == Options.SourceType.PANORAMIO: -- self.dialog = AddPanoramioDialog() - - self.dialog.set_edited_row(edited_row) - self.show_dialog(self.dialog) -@@ -786,9 +781,6 @@ - def on_add_wallhaven_clicked(self, widget=None): - self.show_dialog(AddWallhavenDialog()) - -- def on_add_panoramio_clicked(self, widget=None): -- self.show_dialog(AddPanoramioDialog()) -- - def show_dialog(self, dialog): - self.dialog = dialog - self.dialog.parent = self - diff --git a/desktop/variety/fix-valueerror.patch b/desktop/variety/fix-valueerror.patch deleted file mode 100644 index 21a1739d9d08..000000000000 --- a/desktop/variety/fix-valueerror.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur variety-0.6.4.orig/variety/indicator.py variety-0.6.4/variety/indicator.py ---- variety-0.6.4.orig/variety/indicator.py 2017-04-29 07:23:37.000000000 +0200 -+++ variety-0.6.4/variety/indicator.py 2017-04-29 13:30:24.341703536 +0200 -@@ -33,6 +33,8 @@ - use_appindicator = True - except ImportError: - use_appindicator = False -+except ValueError: -+ use_appindicator = False - - from variety_lib import varietyconfig diff --git a/desktop/variety/variety.SlackBuild b/desktop/variety/variety.SlackBuild index 457c47043204..ffceaa32e9c3 100644 --- a/desktop/variety/variety.SlackBuild +++ b/desktop/variety/variety.SlackBuild @@ -24,8 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=variety -VERSION=${VERSION:-0.6.4} -VERSION2=${VERSION2:-0-589-201704290523} +VERSION=${VERSION:-0.8.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -56,15 +55,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_$VERSION-$VERSION2.tar.gz +tar xvf $CWD/$VERSION.tar.gz cd $PRGNAM-$VERSION -# Patches obtained from Archlinux's package -# Disable Panoramio support (removes webkitgtk dependency) -patch -Np1 -i $CWD/disable-panoramio.patch -# Fix error when appindicator is missing -patch -Np1 -i $CWD/fix-valueerror.patch - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -72,14 +65,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md CONTRIBUTING.md AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf $PKG/usr/share/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/desktop/variety/variety.info b/desktop/variety/variety.info index 94bdf6bfcc31..40cac8f7cd48 100644 --- a/desktop/variety/variety.info +++ b/desktop/variety/variety.info @@ -1,10 +1,10 @@ PRGNAM="variety" -VERSION="0.6.4" -HOMEPAGE="https://launchpad.net/variety" -DOWNLOAD="https://launchpad.net/variety/trunk/0.6.4/+download/variety_0.6.4-0-589-201704290523.tar.gz" -MD5SUM="dea8a8ef3f1037047ba01a969c6dd458" +VERSION="0.8.10" +HOMEPAGE="https://peterlevi.com/variety/" +DOWNLOAD="https://github.com/varietywalls/variety/archive/refs/tags/0.8.10.tar.gz" +MD5SUM="eb931c5344ed3c352ecf0b9ab334ea95" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-distutils-extra python2-BeautifulSoup4 configobj" -MAINTAINER="Rodrigo Gimenez" -EMAIL="estrod[at]zoho[dot]com" +REQUIRES="python-distutils-extra configobj httplib2" +MAINTAINER="Kenneth Chan" +EMAIL="kenneth.t.chan@gmail.com" -- cgit v1.2.3