summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO35
-rw-r--r--PKGBUILD44
-rw-r--r--webkit2.patch44
3 files changed, 85 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c7f359b896..ba5c1dd7f17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,24 @@
-# Generated by mksrcinfo v8
-# Mon May 2 06:23:03 UTC 2016
pkgbase = gphotoframe
- pkgdesc = Gnome Photo Frame is a photo frame gadget for the GNOME Desktop.
- pkgver = 2.0.3
+ pkgdesc = Photo frame gadget for the GNOME Desktop
+ pkgver = 2.0.2
pkgrel = 1
- url = http://code.google.com/p/gphotoframe/
- arch = i686
- arch = x86_64
+ url = https://github.com/iblis17/gphotoframe
+ arch = any
license = GPL3
+ makedepends = gnome-doc-utils
makedepends = python2-distutils-extra
- depends = pygtk
- depends = twisted
- depends = pyxdg
- depends = python2-gdata
+ depends = libchamplain
+ depends = python2-feedparser
+ depends = python2-gobject
depends = python2-oauth
- optdepends = python2-simplejson
- optdepends = python2-feedparser
- optdepends = python2-clutter
- optdepends = gnome-python-desktop
- provides = gphotoframe
- conflicts = gphotoframe-git
- source = http://gphotoframe.googlecode.com/files/gphotoframe-2.0-a3.tar.gz
- md5sums = 7fde61994803182c1af93e6b4f4cb5b4
+ depends = python2-pyopenssl
+ depends = python2-twisted
+ depends = python2-xdg
+ depends = webkit2gtk
+ source = gphotoframe-2.0.2.tar.gz::https://github.com/iblis17/gphotoframe/archive/cafe98c74744df0c70d5d375889e4c88f9cdb078.tar.gz
+ source = webkit2.patch
+ sha256sums = 19e7c43a817381f8a93249d109c0b062970644cb6f7b069e7e5c1c798b874fb4
+ sha256sums = be7b536e986b8f55ba8481120dfaff644ee589aa98ea3e0e62649c2c2b5d2891
pkgname = gphotoframe
diff --git a/PKGBUILD b/PKGBUILD
index 4c192fef1e2..f336f3ebf68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,32 @@
# Contributor: Berseker < berseker86 at gmail.com >
pkgname=gphotoframe
-pkgver=2.0.3
-_realver=2.0-a3
+pkgver=2.0.2
+_gitrev=cafe98c74744df0c70d5d375889e4c88f9cdb078
pkgrel=1
-pkgdesc="Gnome Photo Frame is a photo frame gadget for the GNOME Desktop."
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/gphotoframe/"
+pkgdesc="Photo frame gadget for the GNOME Desktop"
+arch=('any')
+url="https://github.com/iblis17/gphotoframe"
license=('GPL3')
-groups=()
-depends=('pygtk' 'twisted' 'pyxdg' 'python2-gdata' 'python2-oauth')
-makedepends=('python2-distutils-extra')
-optdepends=('python2-simplejson' 'python2-feedparser' 'python2-clutter'
-'gnome-python-desktop')
-provides=('gphotoframe')
-conflicts=('gphotoframe-git')
-options=()
-source=(http://gphotoframe.googlecode.com/files/$pkgname-$_realver.tar.gz)
+depends=('libchamplain' 'python2-feedparser' 'python2-gobject' 'python2-oauth'
+ 'python2-pyopenssl' 'python2-twisted' 'python2-xdg' 'webkit2gtk')
+makedepends=('gnome-doc-utils' 'python2-distutils-extra')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/iblis17/gphotoframe/archive/$_gitrev.tar.gz"
+ "webkit2.patch")
+sha256sums=('19e7c43a817381f8a93249d109c0b062970644cb6f7b069e7e5c1c798b874fb4'
+ 'be7b536e986b8f55ba8481120dfaff644ee589aa98ea3e0e62649c2c2b5d2891')
-package() {
- cd "$srcdir/$pkgname-$_realver"
- python2 setup.py install --prefix=$pkgdir/usr/ || return 1
- gconf-merge-schema gphotoframe.schemas
+prepare() {
+ cd $pkgname-$_gitrev
+ find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ patch -Np1 -i ../webkit2.patch
+}
+
+build() {
+ cd $pkgname-$_gitrev
+ python2 setup.py build
}
-md5sums=('7fde61994803182c1af93e6b4f4cb5b4')
+package() {
+ cd $pkgname-$_gitrev
+ python2 setup.py install --root "$pkgdir" --optimize=1
+}
diff --git a/webkit2.patch b/webkit2.patch
new file mode 100644
index 00000000000..1caa2806c8d
--- /dev/null
+++ b/webkit2.patch
@@ -0,0 +1,44 @@
+diff -Naur gphotoframe.orig/lib/plugins/facebook/authdialog.py gphotoframe/lib/plugins/facebook/authdialog.py
+--- gphotoframe.orig/lib/plugins/facebook/authdialog.py 2015-03-27 02:40:55.000000000 +0100
++++ gphotoframe/lib/plugins/facebook/authdialog.py 2017-06-23 19:28:13.243446102 +0200
+@@ -9,7 +9,7 @@
+ import re
+ # from gettext import gettext as _
+
+-from gi.repository import GObject, Gtk, Gdk, WebKit
++from gi.repository import GObject, Gtk, Gdk, WebKit2
+
+ from ..flickr.authdialog import PluginFlickrDialog
+ from ...utils.urlgetautoproxy import urlget_with_autoproxy
+@@ -126,10 +126,10 @@
+ 'display': 'popup'}
+ uri = 'https://www.facebook.com/dialog/oauth?' + urllib.urlencode(values)
+
+- w = WebKit.WebView.new()
++ w = WebKit2.WebView.new()
+ w.set_vexpand(True)
+ w.load_uri(uri)
+- w.connect("document-load-finished", self._get_document_cb)
++ w.connect("load-changed", self._get_document_cb)
+
+ self.add(w)
+ self.show_all()
+diff -Naur gphotoframe.orig/lib/utils/authwebkit.py gphotoframe/lib/utils/authwebkit.py
+--- gphotoframe.orig/lib/utils/authwebkit.py 2015-03-27 02:40:55.000000000 +0100
++++ gphotoframe/lib/utils/authwebkit.py 2017-06-23 19:14:44.068992889 +0200
+@@ -1,5 +1,5 @@
+ import re
+-from gi.repository import Gtk, GObject, WebKit
++from gi.repository import Gtk, GObject, WebKit2
+
+ class AuthWebKitScrolledWindow(Gtk.ScrolledWindow):
+
+@@ -9,7 +9,7 @@
+
+ url = self._get_auth_url()
+
+- w = WebKit.WebView.new()
++ w = WebKit2.WebView.new()
+ w.set_vexpand(True)
+ w.load_uri(url)
+ w.connect("document-load-finished", self._get_document_cb)