Fix build change meson.build

3 files changed, 61 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8db79112fda7..e78104e59487 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pamac-cli
 	pkgdesc = Pamac cli frontend for libalpm
 	pkgver = 8.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.manjaro.org/applications/pamac
 	arch = i686
 	arch = x86_64
@@ -30,8 +30,10 @@ pkgbase = pamac-cli
 	conflicts = pamac-aur-git
 	replaces = pamac
 	options = !emptydirs
-	source = pamac-8.0.3-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v8.0.3/pamac-v8.0.3.tar.gz
+	source = pamac-8.0.3-2.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v8.0.3/pamac-v8.0.3.tar.gz
+	source = meson.build
 	sha256sums = 63c65e51f5f62ae79faf315e395e5e15bfa23d5f36b138d02613d32bf097a6e8
+	sha256sums = 732512829081cb979a01087a8d8ec2a578e6555ed4f67af998537f6707d8bcaf
 
 pkgname = pamac-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 6aba2f7e2540..6d2f1b6f4171 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 # https://gitlab.manjaro.org/packages/extra/pamac
 pkgname=pamac-cli
 pkgver=8.0.3
-pkgrel=1
+pkgrel=2
 _pkgfixver=$pkgver
 
 _pkgvercommit=v$pkgver
 # _pkgvercommit=a1ea02d9180bf8708f40a50939f455ac5fe34435
-sha256sums=('63c65e51f5f62ae79faf315e395e5e15bfa23d5f36b138d02613d32bf097a6e8')
+sha256sums=('63c65e51f5f62ae79faf315e395e5e15bfa23d5f36b138d02613d32bf097a6e8'
+            '732512829081cb979a01087a8d8ec2a578e6555ed4f67af998537f6707d8bcaf')
 
 pkgdesc="Pamac cli frontend for libalpm"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -23,7 +24,7 @@ replaces=('pamac')
 options=(!emptydirs)
 install=
 
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_pkgvercommit/pamac-$_pkgvercommit.tar.gz")
+source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_pkgvercommit/pamac-$_pkgvercommit.tar.gz" "meson.build")
 
 prepare() {
   cd "$srcdir/pamac-$_pkgvercommit"
@@ -33,6 +34,7 @@ prepare() {
 }
 
 build() {
+  cp -f "$srcdir/meson.build" "$srcdir/pamac-$_pkgvercommit/src/meson.build"
   cd "$srcdir/pamac-$_pkgvercommit"
   mkdir -p builddir
   cd builddir
diff --git a/meson.build b/meson.build
new file mode 100644
index 000000000000..1dab838eceef
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,52 @@
+libalpm = dependency('libalpm')
+gio = dependency('gio-2.0')
+json = dependency('json-glib-1.0')
+appstream = dependency('appstream-glib')
+libsoup = dependency('libsoup-2.4')
+libcurl = dependency('libcurl')
+gobject = dependency('gobject-2.0')
+
+posix = meson.get_compiler('vala').find_library('posix')
+math = meson.get_compiler('c').find_library('m')
+
+vala_deps = [gobject]
+alpm_deps = [libalpm, gio, posix]
+
+alpm_vala_args = ['--vapidir=' + join_paths(meson.source_root(), 'vapi')]
+alpm_c_args = ['-D_FILE_OFFSET_BITS=64']
+
+common_vala_args = ['--pkg=posix', '--target-glib=2.38']
+common_c_args = ['-DGETTEXT_PACKAGE="pamac"']
+
+common_sources = ['common.vala', 'package.vala', 'pamac_config.vala']
+
+libpamac = library('pamac',
+	sources: [common_sources, 'error.vala', 'alpm_config.vala', 'aur.vala', 'database.vala', 'transaction_interface.vala', 'alpm_utils.vala', 'transaction_interface_root.vala', 'transaction_interface_daemon.vala', 'transaction.vala'],
+	dependencies: [alpm_deps, math, json, appstream, libsoup, libcurl],
+	vala_args: [common_vala_args, alpm_vala_args],
+	c_args: [common_c_args, alpm_c_args],
+	vala_gir: 'Pamac-8.0.gir',
+	install: true,
+	install_dir: [true, true, true, true])
+
+# create pkg-config file
+pkg = import('pkgconfig')
+pkg.generate(libpamac,
+	description: 'Pamac Library')
+
+# create typelib files
+g_ir_compiler = find_program('g-ir-compiler')
+custom_target('pamac typelib', command: [g_ir_compiler, '--shared-library', 'libpamac', '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'Pamac-8.0.gir')],
+	output: 'Pamac-8.0.typelib',
+	depends: libpamac,
+	install: true,
+	install_dir: join_paths(get_option('libdir'), 'girepository-1.0'))
+
+libpamac_dep = declare_dependency(link_with: libpamac)
+
+executable('pamac',
+	sources: ['version.vala', 'transaction-cli.vala', 'cli.vala'],
+	dependencies: [gio, posix, math, libpamac_dep],
+	vala_args: [common_vala_args, '--pkg=linux'],
+	c_args: common_c_args,
+	install: true)