summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMr.Smith19742023-07-14 11:17:35 +0300
committerMr.Smith19742023-07-14 11:17:35 +0300
commit45e9877d54ee879a56a0eb94eab37ead5c46c084 (patch)
tree0001522feaf006adf04d7f9f6a9ab33e387bf1c4
parent8cf6c10cd6a8b98e1eff0318dc260eb58713d556 (diff)
downloadaur-appimage-git.tar.gz
Updated build
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD49
2 files changed, 28 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da836c53ce06..274a807f5e2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = appimage-git
pkgdesc = Package desktop applications as AppImages that run on common Linux-based operating systems, such as RHEL, CentOS, Ubuntu, Fedora, debian and derivatives.
- pkgver = r1597.801e789
+ pkgver = r1724.701b711
pkgrel = 1
url = http://appimage.org
arch = i686
@@ -11,6 +11,7 @@ pkgbase = appimage-git
makedepends = wget
makedepends = vim
makedepends = desktop-file-utils
+ makedepends = squashfuse
depends = fuse
depends = glib2
depends = glibc
@@ -27,8 +28,9 @@ pkgbase = appimage-git
provides = appimage
conflicts = appimage
options = !strip
- source = git://github.com/probonopd/AppImageKit
+ source = git+https://github.com/AppImage/AppImageKit
+ source = git+https://github.com/AppImageCommunity/libappimage
+ md5sums = SKIP
md5sums = SKIP
pkgname = appimage-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 1e5ae9325aab..b4ebd2b7c7ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,21 @@
pkgname=appimage-git
_gitname=AppImageKit
pkgdesc="Package desktop applications as AppImages that run on common Linux-based operating systems, such as RHEL, CentOS, Ubuntu, Fedora, debian and derivatives."
-pkgver=r1597.801e789
+pkgver=r1724.701b711
pkgrel=1
arch=('i686' 'x86_64')
url="http://appimage.org"
license=('MIT')
depends=('fuse' 'glib2' 'glibc' 'binutils' 'coreutils' 'zlib' 'lz4' 'zsync' 'inotify-tools' 'openssl' 'libarchive' 'xz' 'cairo')
-makedepends=('git' 'cmake' 'wget' 'vim' 'desktop-file-utils')
+makedepends=('git' 'cmake' 'wget' 'vim' 'desktop-file-utils' 'squashfuse')
provides=('appimage')
conflicts=('appimage')
options=('!strip')
install=
-source=('git://github.com/probonopd/AppImageKit')
-md5sums=('SKIP')
+source=("git+https://github.com/AppImage/AppImageKit"
+ "git+https://github.com/AppImageCommunity/libappimage")
+md5sums=('SKIP'
+ 'SKIP')
pkgver() {
cd "${srcdir}/${_gitname}"
@@ -30,36 +32,31 @@ pkgver() {
prepare() {
cd "${srcdir}/${_gitname}"
+ git submodule init
+ git config submodule.lib/libappimage.url "${srcdir}/libappimage"
+ git -c protocol.file.allow=always submodule update
- ./build.sh --clean
+ cd "${srcdir}/${_gitname}/lib/libappimage/lib"
+ git submodule init
+ git -c protocol.file.allow=always submodule update
- sed -i "s/ctest -V/echo 'Skip Tests...'/g" build.sh
}
build() {
cd "${srcdir}/${_gitname}"
- ./build.sh --no-dependencies --use-shared-libs
-
- # Copy metainfo files
- mkdir -p appimagetool.AppDir/usr/share/metainfo/
-
- cp resources/usr/share/metainfo/appimagetool.appdata.xml appimagetool.AppDir/usr/share/metainfo/
-
- # Generate appimage files
- cd build/out
- appimagetool.AppDir/AppRun -n appimagetool.AppDir appimagetool
+ [[ -d build ]] && rm -rf build
+ mkdir build && cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DUSE_SYSTEM_XZ=ON \
+ -DUSE_SYSTEM_SQUASHFUSE=ON \
+ -DUSE_SYSTEM_LIBARCHIVE=ON \
+ -DBUILD_TESTING=OFF
+ make
}
package(){
cd "$srcdir/${_gitname}"
-
- mkdir -p "$pkgdir"/usr/bin
- mkdir -p "$pkgdir"/usr/share/appimage
-
- cp build/out/appimagetool "$pkgdir"/usr/bin/
-
- cp src/AppRun.c "$pkgdir"/usr/share/appimage/
- cp README.md "$pkgdir"/usr/share/appimage/
-
- install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+ DESTDIR="$pkgdir" cmake -P cmake_install.cmake --install build
}