diff options
author | Zeph | 2019-10-13 10:40:31 +0200 |
---|---|---|
committer | Zeph | 2019-10-13 10:40:31 +0200 |
commit | 5c5f2fa34f54fc0a6c8e1a041a02472b51f4ab94 (patch) | |
tree | 8baa4e6060f07658ccd3a344fa6ea715c0b7e2bf | |
parent | 64d9e3d86b250a0e1d460a9b41d90da4ac64babc (diff) | |
download | aur-5c5f2fa34f54fc0a6c8e1a041a02472b51f4ab94.tar.gz |
V9.0.0
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | meson.build | 101 |
3 files changed, 107 insertions, 28 deletions
@@ -1,7 +1,7 @@ pkgbase = pamac-cli pkgdesc = Pamac cli frontend for libalpm - pkgver = 8.0.4 - pkgrel = 2 + pkgver = 9.0.0 + pkgrel = 1 url = https://gitlab.manjaro.org/applications/pamac arch = i686 arch = x86_64 @@ -30,10 +30,10 @@ pkgbase = pamac-cli conflicts = pamac-aur-git replaces = pamac options = !emptydirs - source = pamac-8.0.4-2.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/fddd7715e23a7199db9498cfee2efecad62074ef/pamac-fddd7715e23a7199db9498cfee2efecad62074ef.tar.gz + source = pamac-9.0.0-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/881953f28aade1676b88a6423a89e46214464127/pamac-881953f28aade1676b88a6423a89e46214464127.tar.gz source = meson.build - sha256sums = a6c9f4f182497bd08ea223a46e3b4ee86facfa37649d38e0fb15d29be41bb1b0 - sha256sums = 732512829081cb979a01087a8d8ec2a578e6555ed4f67af998537f6707d8bcaf + sha256sums = b07f4413bada7a0ad057428cd3daf37489e664b3e17bb6ef25216b22e0a29eff + sha256sums = d930fc889338cb50f6da36ddce3006946c69f6323b7b801d035c516b575ebc5d pkgname = pamac-cli @@ -2,14 +2,14 @@ # Maintainer: Zeph <zeph33@gmail.com> # https://gitlab.manjaro.org/packages/extra/pamac pkgname=pamac-cli -pkgver=8.0.4 -pkgrel=2 +pkgver=9.0.0 +pkgrel=1 _pkgfixver=$pkgver #_pkgvercommit=v$pkgver -_pkgvercommit='fddd7715e23a7199db9498cfee2efecad62074ef' -sha256sums=('a6c9f4f182497bd08ea223a46e3b4ee86facfa37649d38e0fb15d29be41bb1b0' - '732512829081cb979a01087a8d8ec2a578e6555ed4f67af998537f6707d8bcaf') +_pkgvercommit='881953f28aade1676b88a6423a89e46214464127' +sha256sums=('b07f4413bada7a0ad057428cd3daf37489e664b3e17bb6ef25216b22e0a29eff' + 'd930fc889338cb50f6da36ddce3006946c69f6323b7b801d035c516b575ebc5d') pkgdesc="Pamac cli frontend for libalpm" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -41,14 +41,16 @@ build() { meson --prefix=/usr --sysconfdir=/etc # build - ninja src/pamac + ninja } package() { cd "$srcdir/pamac-$_pkgvercommit/builddir" - install -Dm755 "src/pamac" "$pkgdir/usr/bin/pamac" - install -Dm755 "src/libpamac.so" "$pkgdir/usr/lib/libpamac.so" - - + DESTDIR="$pkgdir" ninja install + # clean graphic files + rm -rf "$pkgdir/etc/xdg" + rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir/usr/share/dbus-1/services" + rm -rf "$pkgdir/usr/share/gnome-shell" + rm -rf "$pkgdir/usr/share/icons" } -# vim:set ts=2 sw=2 et: diff --git a/meson.build b/meson.build index 1dab838eceef..bf75013c4f4f 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,18 @@ -libalpm = dependency('libalpm') +gobject = dependency('gobject-2.0') gio = dependency('gio-2.0') +gthread = dependency('gthread-2.0') +libalpm = dependency('libalpm') json = dependency('json-glib-1.0') -appstream = dependency('appstream-glib') libsoup = dependency('libsoup-2.4') +polkit = dependency('polkit-gobject-1') libcurl = dependency('libcurl') -gobject = dependency('gobject-2.0') +libnotify = dependency('libnotify') +appstream = dependency('appstream-glib') + +# gtk3 = dependency('gtk+-3.0', version : '>=3.22') +# gdk3 = dependency('gdk-3.0') +# gdk_pixbuf2 = dependency('gdk-pixbuf-2.0') +# vte3 = dependency('vte-2.91') posix = meson.get_compiler('vala').find_library('posix') math = meson.get_compiler('c').find_library('m') @@ -12,20 +20,41 @@ 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_vala_args = ['--pkg=posix', '--target-glib=2.38', '--vapidir=' + join_paths(meson.source_root(), 'vapi')] common_c_args = ['-DGETTEXT_PACKAGE="pamac"'] -common_sources = ['common.vala', 'package.vala', 'pamac_config.vala'] +common_sources = ['common.vala', 'package.vala', 'alpm_package.vala', 'pamac_config.vala'] +# transaction_gtk_sources = ['transaction-gtk.vala', 'choose_provider_dialog.vala', 'choose_pkgs_dialog.vala', 'transaction_sum_dialog.vala', 'progress_box.vala'] +# preferences_sources = ['preferences_dialog.vala'] + +libpamac_sources = [common_sources, 'alpm_config.vala', 'aur.vala', 'database.vala', 'transaction_interface.vala', 'alpm_utils.vala', 'transaction_interface_root.vala', 'daemon_interface.vala', 'transaction_interface_daemon.vala', 'transaction.vala'] +libpamac_dependencies = [alpm_deps, math, json, appstream, libsoup, libcurl] + +if get_option('enable-snap') + snapd = dependency('snapd-glib') + gmodule = dependency('gmodule-2.0') + + libpamac_snap = library('pamac-snap', + sources: ['snap_interface.vala', 'snap_plugin.vala', 'package.vala'], + vala_args: common_vala_args, + c_args: common_c_args, + dependencies: [gio, math, snapd, gmodule], + install: true, + install_dir: [true, true, true]) + + common_vala_args += '--define=ENABLE_SNAP' + libpamac_sources += ['plugin_loader.vala', 'snap_interface.vala'] + libpamac_dependencies += gmodule +endif 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], + sources: libpamac_sources, + dependencies: libpamac_dependencies, + vala_args: common_vala_args, c_args: [common_c_args, alpm_c_args], - vala_gir: 'Pamac-8.0.gir', + vala_gir: 'Pamac-9.0.gir', install: true, install_dir: [true, true, true, true]) @@ -36,17 +65,65 @@ pkg.generate(libpamac, # 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', +custom_target('pamac typelib', command: [g_ir_compiler, '--shared-library', 'libpamac', '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'Pamac-9.0.gir')], + output: 'Pamac-9.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-daemon', + sources: ['common_daemon.vala', 'alpm_utils.vala', 'alpm_config.vala', 'daemon.vala'], + dependencies: [vala_deps, alpm_deps, json, math, libsoup, polkit, libcurl, appstream, libpamac_dep], + vala_args: common_vala_args, + c_args: [common_c_args, alpm_c_args], + install : true) + 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) + +# executable('pamac-tray', +# sources: ['tray.vala', 'tray-gtk.vala'], +# dependencies: [gtk3, libnotify, libpamac_dep], +# vala_args: common_vala_args, +# c_args: common_c_args, +# install: true) + +# if get_option('enable-appindicator') +# appindicator = dependency('appindicator3-0.1') +# executable('pamac-tray-appindicator', +# sources: ['tray.vala', 'tray-appindicator.vala'], +# dependencies: [gtk3, libnotify, appindicator, libpamac_dep], +# vala_args: common_vala_args, +# c_args: common_c_args, +# install: true) +# endif + +# libpamac_gtk = library('pamac-gtk', +# sources: [transaction_gtk_sources, transaction_resources], +# dependencies: [gio, gtk3, vte3, libnotify, posix, math, libpamac_dep], +# vala_args: common_vala_args, +# c_args: common_c_args, +# install: true, +# install_dir: [true, true, true]) + +# libpamac_gtk_dep = declare_dependency(link_with: libpamac_gtk) + +# executable('pamac-manager', +# sources: ['version.vala', 'history_dialog.vala', preferences_sources, 'local_config.vala', 'package_row.vala', 'manager_window.vala', 'manager.vala', 'search-provider.vala', manager_resources], +# dependencies: [gtk3, libsoup, libpamac_dep, libpamac_gtk_dep], +# vala_args: common_vala_args, +# c_args: common_c_args, +# install: true) + +# executable('pamac-installer', +# sources: ['progress_dialog.vala', 'installer.vala', installer_resources], +# dependencies: [gtk3, libpamac_dep, libpamac_gtk_dep], +# vala_args: common_vala_args, +# c_args: common_c_args, +# install: true) |