[arch-commits] Commit in sugar-activity-imageviewer/trunk (2 files)

Balló György bgyorgy at archlinux.org
Tue Dec 11 16:52:31 UTC 2018


    Date: Tuesday, December 11, 2018 @ 16:52:30
  Author: bgyorgy
Revision: 415421

upgpkg: sugar-activity-imageviewer 65-1

Update to new version

Modified:
  sugar-activity-imageviewer/trunk/PKGBUILD
Deleted:
  sugar-activity-imageviewer/trunk/fix-choose-image-button.patch

-------------------------------+
 PKGBUILD                      |   15 +++++++--------
 fix-choose-image-button.patch |   31 -------------------------------
 2 files changed, 7 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-11 16:52:11 UTC (rev 415420)
+++ PKGBUILD	2018-12-11 16:52:30 UTC (rev 415421)
@@ -1,9 +1,10 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=sugar-activity-imageviewer
-_pkgname=ImageViewer
-pkgver=63
-pkgrel=2
+#_pkgname=ImageViewer
+_pkgname=imageviewer-activity
+pkgver=65
+pkgrel=1
 pkgdesc="Image viewer for Sugar"
 arch=('any')
 url="https://wiki.sugarlabs.org/go/Activities/Image_Viewer"
@@ -10,15 +11,13 @@
 license=('GPL')
 groups=('sugar-fructose')
 depends=('sugar-toolkit-gtk3')
-source=(https://download.sugarlabs.org/sources/sucrose/fructose/$_pkgname/$_pkgname-$pkgver.tar.bz2
-        fix-choose-image-button.patch)
-sha256sums=('336fa7c214711d2f65eb4e9bdd0b575004a01d5fc67f35a9a5d5d55ef823dc40'
-            '22bee7f1db29a058fc267e19198b458270d22d435696ec491a5b5448bc610253')
+#source=(https://download.sugarlabs.org/sources/sucrose/fructose/$_pkgname/$_pkgname-$pkgver.tar.bz2)
+source=($pkgname-$pkgver.tar.gz::https://github.com/sugarlabs/imageviewer-activity/archive/v$pkgver.tar.gz)
+sha256sums=('e6561c1c7a404a2c8e68a6b5896c80b47602d5dc6aeaf4b9f255925d755c7b4e')
 
 prepare() {
   cd $_pkgname-$pkgver
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' setup.py
-  patch -Np1 -i ../fix-choose-image-button.patch
 }
 
 package() {

Deleted: fix-choose-image-button.patch
===================================================================
--- fix-choose-image-button.patch	2018-12-11 16:52:11 UTC (rev 415420)
+++ fix-choose-image-button.patch	2018-12-11 16:52:30 UTC (rev 415421)
@@ -1,31 +0,0 @@
-From 5ff2b59266e67eba88fb235560c083b0b4f0d6ce Mon Sep 17 00:00:00 2001
-From: James Cameron <quozl at laptop.org>
-Date: Sat, 30 Sep 2017 19:03:24 +1000
-Subject: [PATCH] Fix choose an image button
-
-When a new instance of ImageViewer is started, the "Choose an image"
-does not work.  A traceback is in log;
-
-Traceback (most recent call last):
-  File "/usr/share/sugar/activities/ImageViewer.activity/ImageViewerActivity.py", line 396, in _show_picker_cb
-    if not self._want_document:
-AttributeError: 'ImageViewerActivity' object has no attribute '_want_document'
-
-Regression caused by d496604 which removed the initialisation of the
-attribute from the object.
----
- ImageViewerActivity.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ImageViewerActivity.py b/ImageViewerActivity.py
-index c7bf7b3..3e5baf0 100644
---- a/ImageViewerActivity.py
-+++ b/ImageViewerActivity.py
-@@ -95,6 +95,7 @@ def __init__(self, handle):
-         # Status of temp file used for write_file:
-         self._tempfile = None
-         self._close_requested = False
-+        self._want_document = True
- 
-         self._zoom_out_button = None
-         self._zoom_in_button = None



More information about the arch-commits mailing list