From ecbe4d24d6a1c05261e1dbad0713d5cfd585eb0e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 13 Sep 2017 15:52:32 +0200 Subject: [PATCH] sysprof: update to 3.24.1. --- common/shlibs | 2 ++ srcpkgs/sysprof-devel | 1 + srcpkgs/sysprof/patches/arm.patch | 16 --------------- srcpkgs/sysprof/template | 33 ++++++++++++++++++++++--------- 4 files changed, 27 insertions(+), 25 deletions(-) create mode 120000 srcpkgs/sysprof-devel delete mode 100644 srcpkgs/sysprof/patches/arm.patch diff --git a/common/shlibs b/common/shlibs index 6a93d9ffa40..0d53299b1f0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2864,3 +2864,5 @@ libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.10 libupnp1.8-1.8.2_1 libevent_extra-2.1.so.6 libevent-2.1.8_3 libevent_openssl-2.1.so.6 libevent-2.1.8_3 +libsysprof-2.so sysprof-3.24.1_1 +libsysprof-ui-2.so sysprof-3.24.1_1 diff --git a/srcpkgs/sysprof-devel b/srcpkgs/sysprof-devel new file mode 120000 index 00000000000..b36b72f12d0 --- /dev/null +++ b/srcpkgs/sysprof-devel @@ -0,0 +1 @@ +sysprof \ No newline at end of file diff --git a/srcpkgs/sysprof/patches/arm.patch b/srcpkgs/sysprof/patches/arm.patch deleted file mode 100644 index 58274c60913..00000000000 --- a/srcpkgs/sysprof/patches/arm.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- util.h 2010-12-07 22:41:57.156243001 -0600 -+++ util.h 2010-12-07 22:43:47.616243002 -0600 -@@ -37,4 +37,13 @@ - #define cpu_relax() asm volatile("" ::: "memory"); - #endif - -+#ifdef __arm__ -+/* -+ * Use the __kuser_memory_barrier helper in the CPU helper page. See -+ * arch/arm/kernel/entry-armv.S in the kernel source for details. -+ */ -+#define rmb() ((void(*)(void))0xffff0fa0)() -+#define cpu_relax() asm volatile("":::"memory") -+#endif -+ - #endif diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 4d8874b997d..31b71f11a45 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,18 +1,33 @@ # Template file for 'sysprof' pkgname=sysprof -version=1.2.0 -revision=4 +version=3.24.1 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="glib-devel gtk+-devel libglade-devel" +hostmakedepends="pkg-config itstool glib-devel" +makedepends="gtk+3-devel polkit-devel glib-devel" short_desc="A system-wide profiler for Linux" maintainer="Juan RP " license="GPL-2" homepage="http://sysprof.com/" -distfiles="http://sysprof.com/sysprof-${version}.tar.gz" -checksum=baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 +distfiles="https://download.gnome.org/sources/sysprof/${version%.*}/$pkgname-$version.tar.xz" +checksum=054eebe2afb6fe3c06ac8c46bc045c42f675d4fd64e6f16cbc602d5c7ce27bec +configure_args="--enable-gtk --with-sysprofd" +case "$XBPS_TARGET_MACHINE" in + x64_64-musl|aarch64-musl) CFLAGS="-D__WORDSIZE=64" ;; + *-musl) CFLAGS="-D__WORDSIZE=32" ;; +esac -post_install() { - vmkdir usr/lib/udev/rules.d - mv ${DESTDIR}/etc/udev/rules.d/* ${DESTDIR}/usr/lib/udev/rules.d +pre_build() { + export SHELL=/bin/bash +} + +sysprof-devel_package() { + depends="sysprof>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove usr/share + } }