From 0541f1e28a2d18f560699fbd77b118c6226e354a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 9 Apr 2022 09:02:28 -0700 Subject: [PATCH 1/2] eudev: add udev_dir pkg-config variable --- ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++ srcpkgs/eudev/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch new file mode 100644 index 000000000000..b36b84f75496 --- /dev/null +++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch @@ -0,0 +1,20 @@ +From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001 +From: oreo639 <31916379+Oreo639@users.noreply.github.com> +Date: Sat, 9 Apr 2022 05:39:56 -0700 +Subject: [PATCH] udev: add udev_dir as synonym of udevdir + +--- + src/udev/udev.pc.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in +index 4a9d867b8..cccebb245 100644 +--- a/src/udev/udev.pc.in ++++ b/src/udev/udev.pc.in +@@ -3,4 +3,5 @@ Description: eudev + Version: @UDEV_VERSION@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-udevdir=@udevlibexecdir@ ++udev_dir=@udevlibexecdir@ ++udevdir=${udev_dir} diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index df783c562bca..68c50149e028 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided pkgname=eudev version=3.2.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-hwdb --enable-manpages --disable-introspection" hostmakedepends="pkg-config gperf" From a9e1d5ab8e919a849baa258c6c72f206948b648d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:51:49 -0700 Subject: [PATCH 2/2] upower: update to 0.99.17 --- .../upower/patches/fix-gtk-doc-disable.patch | 58 +++++++++++++++++++ srcpkgs/upower/template | 38 ++++++------ 2 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch new file mode 100644 index 000000000000..5005d91e197e --- /dev/null +++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch @@ -0,0 +1,58 @@ +From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 15:32:55 -0700 +Subject: [PATCH] meson: Don't search for gtk-doc if disabled + +--- + doc/meson.build | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index dc93a16..5fc253c 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -27,21 +27,23 @@ version_xml = configure_file( + input: 'version.xml.in', + configuration: cdata) + +-gnome.gtkdoc('UPower', +- main_xml: 'upower-docs.xml', +- src_dir: meson.source_root() / 'libupower-glib', +- dependencies: [ libupower_glib_dep ], +- scan_args: ['--rebuild-types', '--rebuild-sections'], +- content_files: [ +- version_xml, +- ifaces_refs, +- 'man/UPower.xml', +- 'man/upowerd.xml', +- 'man/upower.xml', +- '../COPYING', +- ], +- ignore_headers: [ +- 'config.h', +- ], +- install: get_option('gtk-doc') +-) ++if get_option('gtk-doc') ++ gnome.gtkdoc('UPower', ++ main_xml: 'upower-docs.xml', ++ src_dir: meson.source_root() / 'libupower-glib', ++ dependencies: [ libupower_glib_dep ], ++ scan_args: ['--rebuild-types', '--rebuild-sections'], ++ content_files: [ ++ version_xml, ++ ifaces_refs, ++ 'man/UPower.xml', ++ 'man/upowerd.xml', ++ 'man/upower.xml', ++ '../COPYING', ++ ], ++ ignore_headers: [ ++ 'config.h', ++ ], ++ install: true ++ ) ++endif +-- +GitLab + diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index b87ec0d5f9e0..654c901f129e 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,39 +1,36 @@ # Template file for 'upower' pkgname=upower -version=0.99.13 +version=0.99.17 revision=1 -_distver="${version//./_}" -wrksrc="upower-UPOWER_${_distver}" -build_style=gnu-configure +wrksrc="upower-v${version}" build_helper="gir" -configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)" +build_style=meson +configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no + -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)" conf_files="/etc/UPower/UPower.conf" -hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc - intltool libtool libxslt pkg-config which" +hostmakedepends="gettext glib-devel gobject-introspection + $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which" makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel polkit-devel" checkdepends="python3-dbus python3-packaging" short_desc="Abstraction for enumerating power devices" maintainer="cinerea0 " license="GPL-2.0-or-later" -homepage="https://upower.freedesktop.org" -distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2" -checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d +homepage="https://gitlab.freedesktop.org/upower/upower" +changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2" +checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d provides="upower0-${version}_${revision}" replaces="upower0>=0" # Package build options -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" -post_patch() { - vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/' -} - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi libupower-glib3_package() { short_desc+=" - runtime library" @@ -49,9 +46,12 @@ upower-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi - vmove "usr/lib/*.so" + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } }