ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity

libdbusmenu-gtk2: updated source, added patches

Browse Source
This commit is contained in:
Tim Biermann 2023-07-08 22:59:07 +02:00
parent 85212f1848
commit 753b171b28
6 changed files with 155 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdbusmenu-gtk2/.footprint
View File

@ -1,7 +1,5 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libdbusmenu-glib-0.4/
drwxr-xr-x root/root usr/include/libdbusmenu-glib-0.4/libdbusmenu-glib/
drwxr-xr-x root/root usr/include/libdbusmenu-gtk-0.4/
drwxr-xr-x root/root usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk/
-rw-r--r-- root/root usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h

10
libdbusmenu-gtk2/.signature
View File

@ -1,6 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF36/kFsz5iYNbLkEUm8bZTwoSArS5nduIEO1YPMfmjsz/oQEnYZoGjYGUQp06dIW5fyYS0CSWLzU7kUIwdXTjpg4=
SHA256 (Pkgfile) = 6b9dc66cefd3c8a440c86f128f96223672d59113bee7a2aec6d2ac484841be38
SHA256 (.footprint) = 5bec7509fcf384613bbe208ce5d8551fb2d980836cc383af18e08c5ca58ef981
SHA256 (libdbusmenu_18.10.20180917~bzr490+repack1.orig.tar.xz) = f670bc86ea5ae1488b2405f371ceb870ce353127578f9b0aed2862cbbc42053b
RWSagIOpLGJF30RqTLUnakUUQ8jXYtVSHO/EMpHx4RXfuyOyKrjvdUiM6Rd2B4F+Eq5XlP3c6S72166JvD47HCOOFnUPcxjWtgg=
SHA256 (Pkgfile) = 376cab852f13bf1e74a8c91d77d857af8af53a7919c30b60505df661cf037d0f
SHA256 (.footprint) = 7a5491bcdc38fe78f0de0ee105e5caeb13d6dfb9feb03f3eda6d0d11a3b96f56
SHA256 (libdbusmenu_18.10.20180917~bzr492+repack1.orig.tar.xz) = 41298b926573419f21864205317461750b833c596af6ab0bd206e13336f8cee3
SHA256 (0001_no-deprecated-gnome-common-macros.patch) = a65626ad3dd26a81037332d881736587929c7f8935cd34d2fc3e7f4a988d5a72
SHA256 (0003_port-tools-dbusmenu-bench-to-py3.patch) = 5596fa1d311e80e780af9d2453e1b81f2b9604bb9894333c51a1361f41778919
SHA256 (0004_prevent-test-json-from-failing.patch) = 42f61f6b2a9c3e355a21f3fc8f9583963704e8c299b0f12c07499e41ce99c992

29
libdbusmenu-gtk2/0002_fix-ftbfs-gtk-doc-1-32.patch Normal file
View File

@ -0,0 +1,29 @@
Description: Fix empty tree_index files not being built anymore.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
@@ -18,10 +18,6 @@
<xi:include href="xml/types.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
--- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
+++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
@@ -17,10 +17,6 @@
<xi:include href="xml/parser.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

92
libdbusmenu-gtk2/0003_port-tools-dbusmenu-bench-to-py3.patch Normal file
View File

@ -0,0 +1,92 @@
Description: Port tools/dbusmenu-bench from Py2 to Py3.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/tools/dbusmenu-bench
+++ b/tools/dbusmenu-bench
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# encoding: utf-8
"""
A library to communicate a menu object set accross DBus and
@@ -60,8 +60,8 @@
def dump_properties(properties, prepend=""):
- for key, value in properties.items():
- print "%s- %s: %s" % (prepend, key, value)
+ for key, value in list(properties.items()):
+ print("%s- %s: %s" % (prepend, key, value))
def run_test_sequence(menu, dump=False):
@@ -74,9 +74,9 @@
revision, layout = menu.GetLayout(dbus.Int32(0))
times["GetLayout"] = chrono.elapsed()
if dump:
- print "revision:", revision
- print "layout:"
- print layout
+ print("revision:", revision)
+ print("layout:")
+ print(layout)
# Get ids
tree = ET.fromstring(layout)
@@ -89,27 +89,27 @@
children = menu.GetChildren(dbus.Int32(root_id), property_names)
times["GetChildren"] = chrono.elapsed()
if dump:
- print "children:"
+ print("children:")
for child in children:
id, properties = child
- print "- %d:" % id
+ print("- %d:" % id)
dump_properties(properties, prepend=" ")
chrono.restart()
properties = menu.GetProperties(dbus.Int32(child_id), property_names)
times["GetProperties"] = chrono.elapsed()
if dump:
- print "properties:"
+ print("properties:")
dump_properties(properties)
return times
def create_timing_dict():
- return dict(zip(PROBES, itertools.repeat(0)))
+ return dict(list(zip(PROBES, itertools.repeat(0))))
def print_probe(prefix, name, value, timestamp):
value = int(value * 1000000)
- print "%(prefix)s.%(name)s:%(value)d@%(timestamp)d" % locals()
+ print("%(prefix)s.%(name)s:%(value)d@%(timestamp)d" % locals())
def main():
parser = OptionParser(usage = "%prog [options]")
@@ -134,7 +134,7 @@
max_timings = create_timing_dict()
for x in range(options.count):
timings = run_test_sequence(menu)
- for name, timing in timings.items():
+ for name, timing in list(timings.items()):
cumulated_timings[name] += timing
if min_timings[name] == 0 or min_timings[name] > timing:
min_timings[name] = timing
@@ -142,11 +142,11 @@
max_timings[name] = timing
timestamp = int(time.time())
- for name, timing in cumulated_timings.items():
+ for name, timing in list(cumulated_timings.items()):
print_probe("average", name, timing / options.count, timestamp)
- for name, timing in min_timings.items():
+ for name, timing in list(min_timings.items()):
print_probe("min", name, timing, timestamp)
- for name, timing in max_timings.items():
+ for name, timing in list(max_timings.items()):
print_probe("max", name, timing, timestamp)
return 0

14
libdbusmenu-gtk2/0004_prevent-test-json-from-failing.patch Normal file
View File

@ -0,0 +1,14 @@
Origin: https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu/trunk.16.10/revision/497/tests/Makefile.am#tests/Makefile.am
=== modified file 'tests/Makefile.am'
--- a/tests/Makefile.am 2019-09-13 16:53:05 +0000
+++ b/tests/Makefile.am 2022-09-28 21:56:18 +0000
@@ -219,6 +219,7 @@
@echo export G_MESSAGES_DEBUG=all >> $@
@echo $(XVFB_RUN) >> $@
@echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
+ @echo sed -i \"/Using cross-namespace EXTERNAL authentication \(this will deadlock if server is GDBus \< 2.73.3\)/d\" test-json-01.output.json >> $@
@echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
@chmod +x $@

21
libdbusmenu-gtk2/Pkgfile
View File

@ -1,17 +1,26 @@
# Description: Library for passing menus over DBus - gtk2 Files
# URL: https://launchpad.net/libdbusmenu
# Maintainer: Tim Biermann, tbier at posteo dot de
# Depends on: graphite2 gtk json-glib libdbusmenu-glib util-linux xorg-libxdamage
# Depends on: gtk json-glib libdbusmenu-glib xorg-libxdamage
name=libdbusmenu-gtk2
version=18.10
release=2
source=(http://cdn-fastly.deb.debian.org/debian/pool/main/libd/libdbusmenu/libdbusmenu_18.10.20180917~bzr490+repack1.orig.tar.xz
0001_no-deprecated-gnome-common-macros.patch)
release=3
source=(http://cdn-fastly.deb.debian.org/debian/pool/main/libd/libdbusmenu/libdbusmenu_18.10.20180917~bzr492+repack1.orig.tar.xz
0001_no-deprecated-gnome-common-macros.patch
0003_port-tools-dbusmenu-bench-to-py3.patch
0004_prevent-test-json-from-failing.patch)
build() {
cd libdbusmenu-18.10.20180917~bzr490
cd libdbusmenu-18.10.20180917~bzr492
export HAVE_VALGRIND_TRUE='#'
export HAVE_VALGRIND_FALSE=''
patch -Np1 -i $SRC/0001_no-deprecated-gnome-common-macros.patch
patch -Np1 -i $SRC/0003_port-tools-dbusmenu-bench-to-py3.patch
patch -Np1 -i $SRC/0004_prevent-test-json-from-failing.patch
sed -e 's/gtkdocize || exit 1//g' -i autogen.sh
sed -e 's/--enable-gtk-doc//g' -i autogen.sh
export CFLAGS+=" -O2 -Wno-error"
@ -22,9 +31,7 @@ build() {
--localstatedir=/var \
--with-gtk=2
make -j1
make DESTDIR=$PKG -C libdbusmenu-glib install
make DESTDIR=$PKG -C libdbusmenu-gtk install
make DESTDIR=$PKG -C libdbusmenu-glib uninstall
rm -fr $PKG/usr/share/doc