summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian2023-05-20 11:01:17 +0200
committerJulian2023-05-20 11:01:17 +0200
commit20e4e2bdf146828799062e6097b4b08481158547 (patch)
treeb08e192e56f9c886ec6d5ba55d271aede0cf3b74
parenta205fb313ad2db62e6a6cbd2733ce0cd718485ba (diff)
downloadaur-purism-chatty-git.tar.gz
Successfully build latest version, add myself as a maintainer
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD59
-rw-r--r--latest_olm.patch12
3 files changed, 31 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a1621f33303d..4fc727c68b76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = purism-chatty-git
pkgdesc = XMPP and SMS messaging via libpurple and Modemmanager
- pkgver = 0.5.0_beta3.r1.g73caf3d
+ pkgver = 0.7.3
pkgrel = 1
url = https://source.puri.sm/Librem5/chatty
arch = i686
@@ -8,29 +8,20 @@ pkgbase = purism-chatty-git
arch = armv6h
arch = armv7h
arch = aarch64
- license = LGPL2.1
- makedepends = git
- makedepends = pkg-config
+ license = GPL3
+ makedepends = itstool
makedepends = meson
- makedepends = libolm
+ makedepends = pkg-config
depends = evolution-data-server
depends = feedbackd
- depends = gtk4
- depends = libhandy
+ depends = libolm
depends = libpurple
- depends = gspell
- depends = libmm-glib
- optdepends = feedbackd: haptic, visual and audio feedback
- optdepends = libpurple-carbons: XMPP Carbon Copy - Live multiple device support
- optdepends = libpurple-lurch: message encryption when using OMEMO
- optdepends = mmsd-tng: support MMS send/receive
- optdepends = purple-telegram: Telegram support
- optdepends = purple-matrix: Matrix support
+ optdepends = libpurple-carbons: XMPP XEP-0280 Message Carbons
+ optdepends = libpurple-lurch: XMPP E2E OMEMO encryption
+ optdepends = purple-xmpp-http-upload: XMPP HTTP Upload - Filesharing
provides = purism-chatty
conflicts = purism-chatty
- source = purism-chatty::git+https://source.puri.sm/Librem5/chatty.git
- source = latest_olm.patch
- md5sums = SKIP
- md5sums = c934d64deacfdec2592cea05d1a7f8cc
+ source = git+https://source.puri.sm/Librem5/chatty.git
+ sha512sums = SKIP
pkgname = purism-chatty-git
diff --git a/PKGBUILD b/PKGBUILD
index cb72917ad387..0d77c8373ab9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,38 @@
# Maintainer: genofire <geno+dev@fireorbit.de>
+# Maintainer: Julian <juliannfairfax@protonmail.com>
# Contributor: la Fleur <lafleur at boum dot org>
_pkgname="purism-chatty"
-pkgname="${_pkgname}-git" # '-bzr', '-git', '-hg' or '-svn'
-pkgver=0.5.0_beta3.r1.g73caf3d
+pkgname="${_pkgname}-git"
+pkgver=0.7.3
pkgrel=1
pkgdesc="XMPP and SMS messaging via libpurple and Modemmanager"
url="https://source.puri.sm/Librem5/chatty"
-license=("LGPL2.1")
+license=("GPL3")
arch=("i686" "x86_64" "armv6h" "armv7h" "aarch64")
depends=("evolution-data-server"
- "feedbackd"
- "gtk4"
- "libhandy"
- "libpurple"
- "gspell"
- "libmm-glib")
-optdepends=("libpurple-carbons: XMPP Carbon Copy - Live multiple device support"
- "libpurple-lurch: message encryption when using OMEMO"
- "mmsd-tng: support MMS send/receive"
- "purple-telegram: Telegram support"
- "purple-matrix: Matrix support")
-makedepends=("git" "pkg-config" "meson" "libolm")
+ "feedbackd"
+ "libolm"
+ "libpurple")
+optdepends=("libpurple-carbons: XMPP XEP-0280 Message Carbons plugin"
+ "libpurple-lurch: XEP-0384 OMEMO Encryption plugin"
+ "purple-xmpp-http-upload: HTTP File Upload plugin")
+makedepends=("itstool"
+ "meson"
+ "pkg-config")
provides=("purism-chatty")
conflicts=("purism-chatty")
-# Keep the source in a version-independent directory, so on update we simply
-# git pull into it.
-source=(
- "${_pkgname}::git+https://source.puri.sm/Librem5/chatty.git"
- "latest_olm.patch"
-)
-md5sums=(SKIP c934d64deacfdec2592cea05d1a7f8cc)
-
-pkgver() {
- git -C ${_pkgname} describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- patch --directory=${_pkgname} --forward --strip=1 --input=${srcdir}/latest_olm.patch
-}
+source=("git+https://source.puri.sm/Librem5/chatty.git")
+sha256sums=("SKIP")
build() {
- # Only setup the build directory if it doesn't exist :
- test -d build || arch-meson ${_pkgname} build
- ninja -C build
-}
-
-check() {
- ninja -C build test
+ cd chatty
+ git submodule update --init
+ arch-meson build
+ ninja -C build
}
package() {
- DESTDIR="${pkgdir}" ninja -C build install
+ cd chatty
+ DESTDIR="${pkgdir}" ninja -C build install
}
diff --git a/latest_olm.patch b/latest_olm.patch
deleted file mode 100644
index 53af14676e86..000000000000
--- a/latest_olm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --unified --recursive --text purism-chatty.orig/sm.puri.Chatty.json purism-chatty.new/sm.puri.Chatty.json
---- purism-chatty.orig/sm.puri.Chatty.json 2021-12-12 15:56:30.110497868 +0100
-+++ purism-chatty.new/sm.puri.Chatty.json 2021-12-12 15:59:49.744909048 +0100
-@@ -224,7 +224,7 @@
- "sources": [
- {
- "type": "git",
-- "tag" : "3.2.6",
-+ "tag" : "3.2.7",
- "url": "https://gitlab.matrix.org/matrix-org/olm.git"
- }
- ]