diff options
| -rw-r--r-- | castor-git/PKGBUILD | 8 | ||||
| -rw-r--r-- | castor-git/castor-0.4.0-install.patch | 19 | ||||
| -rw-r--r-- | castor-git/castor-0.7.0-makefile.patch | 17 |
3 files changed, 21 insertions, 23 deletions
diff --git a/castor-git/PKGBUILD b/castor-git/PKGBUILD index 91638f4..dfdd19d 100644 --- a/castor-git/PKGBUILD +++ b/castor-git/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=castor pkgname=castor-git -pkgver=0.4.0.r1.g7f50a34 +pkgver=0.7.0.r6.g188cd6c pkgrel=1 pkgdesc="A gemini, gopher and finger graphical client" arch=('i686' 'x86_64') @@ -13,9 +13,9 @@ license=('unknown') depends=('gtk3' 'gdk-pixbuf2' 'pango' 'atk' 'cairo' 'openssl') makedepends=('git' 'rust' 'cargo') source=("${_pkgname}::git+${url}" - 'castor-0.4.0-install.patch') + castor-0.7.0-makefile.patch) sha256sums=('SKIP' - 'a659bb60626aa505b6f61f2a4669304a9806717858c79facc69b101879e4d0e2') + '5ac7e5460d00176db71ec0d7972af1adee58c57dd9d7dff29ddecbadb07f4ee9') pkgver() { cd "${_pkgname}" @@ -29,7 +29,7 @@ prepare() { cd "${_pkgname}" # Fix installing to pkgdir - patch -p1 -i ../castor-0.4.0-install.patch + patch -p1 -i ../castor-0.7.0-makefile.patch } build() { diff --git a/castor-git/castor-0.4.0-install.patch b/castor-git/castor-0.4.0-install.patch deleted file mode 100644 index 678194f..0000000 --- a/castor-git/castor-0.4.0-install.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r -u -N castor/Makefile castor-install/Makefile ---- castor/Makefile 2020-01-24 15:28:53.812889790 +0100 -+++ castor-install/Makefile 2020-01-24 16:11:36.809011148 +0100 -@@ -36,12 +36,10 @@ - $(INSTALL_DATA) data/org.typed-hole.castor-32.png $(sharedir)/icons/hicolor/32x32/apps/org.typed-hole.castor.png - $(INSTALL_DATA) data/org.typed-hole.castor-64.png $(sharedir)/icons/hicolor/64x64/apps/org.typed-hole.castor.png - $(INSTALL_DATA) data/org.typed-hole.castor-128.png $(sharedir)/icons/hicolor/128x128/apps/org.typed-hole.castor.png -- # Force icon cache refresh -- touch $(sharedir)/icons/hicolor -- cp target/release/castor /usr/bin/castor -- # Install desktop file -+ # Create the applications dir if needed -+ mkdir -p $(sharedir)/applications -+ # Install desktop file - $(INSTALL_DATA) data/Castor.desktop $(sharedir)/applications/Castor.desktop -- update-desktop-database - - uninstall : - # Remove the .desktop diff --git a/castor-git/castor-0.7.0-makefile.patch b/castor-git/castor-0.7.0-makefile.patch new file mode 100644 index 0000000..ec585dd --- /dev/null +++ b/castor-git/castor-0.7.0-makefile.patch @@ -0,0 +1,17 @@ +Common subdirectories: castor/data and castor-makefile/data +Common subdirectories: castor/.git and castor-makefile/.git +diff -u castor/Makefile castor-makefile/Makefile +--- castor/Makefile 2020-04-24 23:57:59.119673418 +0200 ++++ castor-makefile/Makefile 2020-04-24 23:58:41.033151139 +0200 +@@ -29,8 +29,8 @@ + # Install the data files and update the caches + install-data : copy-data + # Force icon cache refresh +- touch $(sharedir)/icons/hicolor +- update-desktop-database ++ #touch $(sharedir)/icons/hicolor ++ #update-desktop-database + + # Just copy the data files, without updating caches + copy-data : +Common subdirectories: castor/src and castor-makefile/src |