summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2019-12-23 09:49:15 -0500
committerTed Alff2019-12-23 09:49:15 -0500
commitc9aafec6b6d0dfb347207969fa0995be1bf9ebf2 (patch)
tree7d76603bfdc3d91a40bc838a25f40d20ee3ac53d
parent7f710fa8520b0731c08f1959ca4cb5c5c093e492 (diff)
downloadaur-c9aafec6b6d0dfb347207969fa0995be1bf9ebf2.tar.gz
Version bump 1.2.0
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD44
-rw-r--r--write_to_confdir.patch66
3 files changed, 15 insertions, 109 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 61e8caac814..67c4e0c7ba1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
pkgbase = superpaper
pkgdesc = Cross-platform multi monitor wallpaper manager
- pkgver = 1.1.2
+ pkgver = 1.2.0
pkgrel = 1
url = https://github.com/hhannine/Superpaper
arch = any
license = MIT
+ makedepends = python-distutils-extra
depends = python-pillow
- depends = python-screeninfo
+ depends = python-screeninfo>=0.6.1
depends = python-wxpython
- depends = python-system_hotkey
- source = superpaper-1.1.2.tar.gz::https://github.com/hhannine/Superpaper/archive/v1.1.2.tar.gz
- source = write_to_confdir.patch
- sha256sums = a564d52cb1b4194de2b1563d9273fec7ea4a7969e6b2b1ff91701e8038c34dfa
- sha256sums = 869aafccfd75f514bf0956bc32df419e4dc7c49c5c11dd8f057e9aebd8ab6e52
+ depends = python-system_hotkey>=1.0.2+10+9541587
+ depends = python-xpybutil
+ source = superpaper-1.2.0.tar.gz::https://github.com/hhannine/Superpaper/archive/v1.2.0.tar.gz
+ sha256sums = 501ffac1bf151e6025c39cc6a8181d70ed9ea6a50aff4c55463fc5b9a9daea03
pkgname = superpaper
diff --git a/PKGBUILD b/PKGBUILD
index be0b90c65f8..90caf6d1c42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,19 @@
# Contributor: twa022 <twa022 at gmail dot com>
pkgname=superpaper
-pkgver=1.1.2
+pkgver=1.2.0
pkgrel=1
pkgdesc="Cross-platform multi monitor wallpaper manager"
arch=('any')
url="https://github.com/hhannine/Superpaper"
license=('MIT')
-depends=('python-pillow' 'python-screeninfo' 'python-wxpython' 'python-system_hotkey')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hhannine/${pkgname^}/archive/v${pkgver}.tar.gz"
- 'write_to_confdir.patch')
-sha256sums=('a564d52cb1b4194de2b1563d9273fec7ea4a7969e6b2b1ff91701e8038c34dfa'
- '869aafccfd75f514bf0956bc32df419e4dc7c49c5c11dd8f057e9aebd8ab6e52')
-
-prepare() {
- cd "${srcdir}/${pkgname^}-${pkgver}"
- patch -uNp2 -r- -i ../write_to_confdir.patch
-}
+depends=('python-pillow' 'python-screeninfo>=0.6.1' 'python-wxpython'
+ 'python-system_hotkey>=1.0.2+10+9541587' 'python-xpybutil')
+makedepends=('python-distutils-extra')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hhannine/${pkgname^}/archive/v${pkgver}.tar.gz")
+sha256sums=('501ffac1bf151e6025c39cc6a8181d70ed9ea6a50aff4c55463fc5b9a9daea03')
package() {
- mkdir -p "${pkgdir}"/usr/{bin,lib,share/applications}
- cp -ar "${srcdir}/${pkgname^}-${pkgver}" "${pkgdir}"/usr/lib/"${pkgname}"
-
- cat > "${pkgdir}"/usr/bin/"${pkgname}" <<- __EOF__
- #!/bin/bash
-
- python /usr/lib/superpaper/superpaper.pyw
- exit $?
- __EOF__
- chmod +x "${pkgdir}"/usr/bin/"${pkgname}"
-
- cat > "${pkgdir}"/usr/share/applications/"${pkgname}".desktop <<- __EOF__
- [Desktop Entry]
- Version=1.0
- Type=Application
- Name=Superpaper
- Comment=$pkgdesc
- Exec=/usr/bin/$pkgname
- Icon=/usr/lib/superpaper/resources/icons8-panorama-filled-96.png
- Categories=Utilities;
- Terminal=false
- StartupNotify=false
- __EOF__
-
- install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${pkgname^}-${pkgver}/LICENSE"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python setup.py install --root "${pkgdir}" --optimize=1
}
diff --git a/write_to_confdir.patch b/write_to_confdir.patch
deleted file mode 100644
index 989d381457e..00000000000
--- a/write_to_confdir.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur ./Superpaper-1.1.1.orig/superpaper.pyw ./Superpaper-1.1.1/superpaper.pyw
---- ./Superpaper-1.1.1.orig/superpaper.pyw 2019-05-19 10:46:28.018404320 -0400
-+++ ./Superpaper-1.1.1/superpaper.pyw 2019-05-19 10:50:10.335921834 -0400
-@@ -50,11 +50,14 @@
- PATH = os.path.dirname(os.path.realpath(sys.executable))
- else:
- PATH = os.path.dirname(os.path.realpath(__file__))
-+CONF_PATH = os.path.expanduser( "~/.config/superpaper" )
- # Derivative paths
--TEMP_PATH = PATH + "/temp/"
-+TEMP_PATH = CONF_PATH + "/temp/"
- if not os.path.isdir(TEMP_PATH):
-- os.mkdir(TEMP_PATH)
--PROFILES_PATH = PATH + "/profiles/"
-+ os.makedirs(TEMP_PATH, exist_ok=True)
-+PROFILES_PATH = CONF_PATH + "/profiles/"
-+if not os.path.isdir(PROFILES_PATH):
-+ os.makedirs(PROFILES_PATH, exist_ok=True)
- TRAY_TOOLTIP = "Superpaper"
- TRAY_ICON = PATH + "/resources/default.png"
- VERSION_STRING = "1.1.1"
-@@ -71,7 +74,7 @@
- DEBUG = True
- # sys.stdout = open(PATH + "/log.txt", "w")
- g_logger.setLevel(logging.INFO)
-- fileHandler = logging.FileHandler("{0}/{1}.log".format(PATH, "log"),
-+ fileHandler = logging.FileHandler("{0}/{1}.log".format(CONF_PATH, "log"),
- mode="w")
- g_logger.addHandler(fileHandler)
- consoleHandler = logging.StreamHandler()
-@@ -104,7 +107,7 @@
- def parse_settings(self):
- global DEBUG, LOGGING, g_set_command_string
- global g_logger, fileHandler, consoleHandler
-- fname = os.path.join(PATH, "general_settings")
-+ fname = os.path.join(CONF_PATH, "general_settings")
- if os.path.isfile(fname):
- f = open(fname, "r")
- try:
-@@ -123,7 +126,7 @@
- sys.excepthook = custom_exception_handler
- fileHandler = logging.FileHandler(
- "{0}/{1}.log"
-- .format(PATH, "log"),
-+ .format(CONF_PATH, "log"),
- mode="w")
- g_logger.addHandler(fileHandler)
- consoleHandler = logging.StreamHandler()
-@@ -185,7 +188,7 @@
- f.close()
-
- def Save(self):
-- fname = os.path.join(PATH, "general_settings")
-+ fname = os.path.join(CONF_PATH, "general_settings")
- f = open(fname, "w")
-
- if self.logging:
-@@ -2018,7 +2021,7 @@
- current_settings = GeneralSettingsData()
- show_help = current_settings.show_help
-
-- fname = os.path.join(PATH, "general_settings")
-+ fname = os.path.join(CONF_PATH, "general_settings")
- f = open(fname, "w")
- if self.cb_logging.GetValue():
- f.write("logging=true\n")