* [PR PATCH] remove gconf
@ 2023-09-30 0:53 CameronNemo
2023-09-30 10:43 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: CameronNemo @ 2023-09-30 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is a new pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages remove-gconf
https://github.com/void-linux/void-packages/pull/46334
remove gconf
- qt6-location: rebuild without GConf-devel
- qt6-position: rebuild without GConf-devel
- upwork: remove
- GConf: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I installed qutebrowser with the rebuilt qt6-location/position packages and used DDG maps and tried to get my location. I was not running GeoClue so it spit out an error about that, but nothing shlibs related. I think the GeoClue error indicates the qt6-location code was loaded and invoked correctly?
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46334.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-gconf-46334.patch --]
[-- Type: text/x-diff, Size: 25636 bytes --]
From 2a078dffb356a295db73cf6d534c91c2f4eb402d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Fri, 29 Sep 2023 17:35:42 -0700
Subject: [PATCH 1/4] qt6-location: rebuild without GConf-devel
---
srcpkgs/qt6-location/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 23542e2b5fd1e..4133428d06a92 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,11 +1,10 @@
# Template file for 'qt6-location'
pkgname=qt6-location
version=6.5.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="perl qt6-base qt6-declarative-host-tools"
-makedepends="qt6-serialport-devel qt6-declarative-devel qt6-position-devel
- GConf-devel"
+makedepends="qt6-serialport-devel qt6-declarative-devel qt6-position-devel"
short_desc="Cross-platform application and UI framework - location"
maintainer="John <me@johnnynator.dev>"
license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
From 83466c8d892aff3ca76277bbff120ac97cbc43fa Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Fri, 29 Sep 2023 17:36:04 -0700
Subject: [PATCH 2/4] qt6-position: rebuild without GConf-devel
---
srcpkgs/qt6-position/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt6-position/template b/srcpkgs/qt6-position/template
index 99d663d876347..c847a6f2a7c6c 100644
--- a/srcpkgs/qt6-position/template
+++ b/srcpkgs/qt6-position/template
@@ -1,10 +1,10 @@
# Template file for 'qt6-position'
pkgname=qt6-position
version=6.5.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="perl qt6-base qt6-declarative-host-tools"
-makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
+makedepends="qt6-serialport-devel qt6-declarative-devel"
short_desc="Cross-platform application and UI framework - position"
maintainer="John <me@johnnynator.dev>"
license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
From 4a6c42048f931e6bc8de0b3c572e4a7f1902688c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Fri, 29 Sep 2023 17:37:20 -0700
Subject: [PATCH 3/4] upwork: remove
Attempts to fetch distfiles yielded no successful results
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/upwork/files/upwork | 2 --
srcpkgs/upwork/template | 35 -------------------------------
3 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 srcpkgs/upwork/files/upwork
delete mode 100644 srcpkgs/upwork/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b75f61119780..9ef3db7195a51 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -650,6 +650,7 @@ replaces="
ttyload-git<=20141117_4
tuxc<=1.1_3
unicorn-python<=1.0.2_2
+ upwork<=5.6.10.0_1
urlmatch-git<=20141116_2
uwsgi-python<=2.0.18_3
v8<=3.24.35.33_4
diff --git a/srcpkgs/upwork/files/upwork b/srcpkgs/upwork/files/upwork
deleted file mode 100644
index fd802f467ec44..0000000000000
--- a/srcpkgs/upwork/files/upwork
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/Upwork/upwork
diff --git a/srcpkgs/upwork/template b/srcpkgs/upwork/template
deleted file mode 100644
index ef8a196d7dfdc..0000000000000
--- a/srcpkgs/upwork/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'upwork'
-pkgname=upwork
-version=5.6.10.0
-revision=1
-_rawver=${version//./_}
-_hashver="b124e6f3a4944b32"
-archs="x86_64"
-depends="alsa-lib gtk+ GConf gdk-pixbuf nss libXtst libXScrnSaver"
-short_desc="Desktop Upwork app"
-maintainer="Arthur Evstifeev <mail@ap4y.me>"
-license="custom:Upwork"
-homepage="https://upwork.com/"
-distfiles="https://upwork-usw2-desktopapp.upwork.com/binaries/v${_rawver}_${_hashver}/${pkgname}_${version}_amd64.deb
- https://upwork.pactsafe.io/versions/5ab3efef63d65b6a18aab106.pdf>LICENSE.pdf"
-checksum="fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c
- 0949da5999c3b948bcc4165e6c55522915d9bab1790d27120eda0915aae143bb"
-repository="nonfree"
-restricted=yes
-nopie=yes
-
-# Skip runtime dependenies check, otherwise NEEDED libGLESv2.so (which is bundled with the package)
-# will trigger dependency on rpi-userland packages (makes no sense on x86_64).
-skiprdeps="/opt/${pkgname^}/libEGL.so"
-
-do_extract() {
- ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb
- bsdtar xf data.tar.xz
-}
-
-do_install() {
- vcopy opt opt
- vcopy usr usr
- vbin ${FILESDIR}/${pkgname}
- vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE.pdf
-}
From 130bc8e6b739b485ed7c08e415f2313b6efd69b7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Fri, 29 Sep 2023 17:40:09 -0700
Subject: [PATCH 4/4] GConf: remove
Closes #17254
---
common/shlibs | 1 -
srcpkgs/GConf-devel | 1 -
srcpkgs/GConf/files/gconf-merge-schema.sh | 35 --
.../GConf/patches/01_xml-gettext-domain.patch | 362 ------------------
srcpkgs/GConf/patches/gconf-reload.patch | 20 -
srcpkgs/GConf/patches/locale.patch | 15 -
srcpkgs/GConf/template | 46 ---
srcpkgs/removed-packages/template | 4 +-
8 files changed, 3 insertions(+), 481 deletions(-)
delete mode 120000 srcpkgs/GConf-devel
delete mode 100644 srcpkgs/GConf/files/gconf-merge-schema.sh
delete mode 100644 srcpkgs/GConf/patches/01_xml-gettext-domain.patch
delete mode 100644 srcpkgs/GConf/patches/gconf-reload.patch
delete mode 100644 srcpkgs/GConf/patches/locale.patch
delete mode 100644 srcpkgs/GConf/template
diff --git a/common/shlibs b/common/shlibs
index ed1b717536e6a..5a9d429b360d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -531,7 +531,6 @@ libicutest.so.73 icu-libs-73.2_1
libaspell.so.15 libaspell-0.60.8_2
libpspell.so.15 libaspell-0.60.8_2
libenchant-2.so.2 enchant2-2.2.3_1
-libgconf-2.so.4 GConf-2.32.0_1
libpackagekit-glib2.so.18 PackageKit-1.1.12_1
libpsl.so.5 libpsl-0.20.2_1
libsoup-2.4.so.1 libsoup-2.34.0_1
diff --git a/srcpkgs/GConf-devel b/srcpkgs/GConf-devel
deleted file mode 120000
index cf3c511e78180..0000000000000
--- a/srcpkgs/GConf-devel
+++ /dev/null
@@ -1 +0,0 @@
-GConf
\ No newline at end of file
diff --git a/srcpkgs/GConf/files/gconf-merge-schema.sh b/srcpkgs/GConf/files/gconf-merge-schema.sh
deleted file mode 100644
index 433be9c1fdf0d..0000000000000
--- a/srcpkgs/GConf/files/gconf-merge-schema.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" -a -z "$2" ]; then
- echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
- exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
- shift
- DOMAIN=$1
- shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ -n "$1" ]; do
- if [ -f "$1" ]; then
- sed -e '/<?xml/d' \
- -e 's|<gconfschemafile>||g' \
- -e 's|</gconfschemafile>||g' \
- -e 's|<schemalist>||g' \
- -e 's|</schemalist>||g' "$1" >> "$OUTFILE"
- fi
- shift
-done
-
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
- sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
diff --git a/srcpkgs/GConf/patches/01_xml-gettext-domain.patch b/srcpkgs/GConf/patches/01_xml-gettext-domain.patch
deleted file mode 100644
index 2a1bf25ff9382..0000000000000
--- a/srcpkgs/GConf/patches/01_xml-gettext-domain.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- a/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400
-+++ b/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
- char *schema_name;
- char *mod_user;
- GTime mod_time;
-+ const char *gettext_domain;
- };
-
- static LocalSchemaInfo* local_schema_info_new (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry
- gconf_schema_get_type (schema));
- gconf_schema_set_owner (current_schema,
- gconf_schema_get_owner (schema));
-+ gconf_schema_set_gettext_domain (current_schema,
-+ gconf_schema_get_gettext_domain (schema));
- }
-
- /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
- else if (c_local_schema && c_local_schema->long_desc)
- gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
-
-+ gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
- return retval;
- }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
- const char *ltype;
- const char *list_type;
- const char *owner;
-+
- GConfValueType vtype;
-- const char *dummy1, *dummy2, *dummy3, *dummy4;
-+ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-
- #if 0
- g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
- "muser", &dummy2,
- "mtime", &dummy3,
- "schema", &dummy4,
-+ "gettext_domain", &dummy5,
-
- NULL))
- return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
- const char *mtime;
- const char *schema;
- const char *type;
-+ const char *gettext_domain;
- const char *dummy1, *dummy2, *dummy3, *dummy4;
- const char *dummy5, *dummy6, *dummy7;
- GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
- mtime = NULL;
- schema = NULL;
- type = NULL;
-+ gettext_domain = NULL;
-
- if (!locate_attributes (context, element_name, attribute_names, attribute_values,
- error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
- "mtime", &mtime,
- "schema", &schema,
- "type", &type,
-+ "gettext_domain", &gettext_domain,
-
- /* These are allowed but we don't use them until
- * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
- */
- if (schema)
- entry->schema_name = g_strdup (schema);
-+
-+ if (gettext_domain)
-+ entry->gettext_domain = g_intern_string (gettext_domain);
- }
- else
- {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
- GConfSchema *schema;
- GConfValueType stype;
- const char *owner;
-+ const char *gettext_domain;
-
- schema = gconf_value_get_schema (value);
-
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-
- g_free (s);
- }
-+
-+ gettext_domain = gconf_schema_get_gettext_domain (schema);
-+
-+ if (gettext_domain)
-+ {
-+ char *s;
-+
-+ s = g_markup_escape_text (gettext_domain, -1);
-+
-+ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+ {
-+ g_free (s);
-+ return FALSE;
-+ }
-+
-+ g_free (s);
-+ }
-
- if (stype == GCONF_VALUE_LIST)
- {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- a/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400
-+++ b/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
-
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- a/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400
-+++ b/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
- cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
- cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
- cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
-
- {
- gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
- gconf_schema_set_owner(sc, cs->owner);
- }
-
-+ if (*cs->gettext_domain != '\0')
-+ {
-+ if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+ else
-+ gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+ }
-+
- {
- GConfValue* val;
-
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- a/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400
-+++ b/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
- GConfValueType car_type; /* Pair car type of the described entry */
- GConfValueType cdr_type; /* Pair cdr type of the described entry */
- gchar* locale; /* Schema locale */
-- gchar* owner; /* Name of creating application */
-+ const gchar* owner; /* Name of creating application */
- gchar* short_desc; /* 40 char or less description, no newlines */
- gchar* long_desc; /* could be a paragraph or so */
-+ const gchar* gettext_domain; /* description gettext domain */
- GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
-
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
- g_free (real->locale);
- g_free (real->short_desc);
- g_free (real->long_desc);
-- g_free (real->owner);
-
- if (real->default_value)
- gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
-
- dest->long_desc = g_strdup (real->long_desc);
-
-- dest->owner = g_strdup (real->owner);
-+ dest->gettext_domain = real->gettext_domain;
-+
-+ dest->owner = real->owner;
-
- dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
- REAL_SCHEMA (sc)->locale = NULL;
- }
-
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+
-+ if (domain)
-+ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+ else
-+ REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
- g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-
-- if (REAL_SCHEMA (sc)->owner)
-- g_free (REAL_SCHEMA (sc)->owner);
--
- if (owner)
-- REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+ REAL_SCHEMA (sc)->owner = g_intern_string (owner);
- else
- REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
- return FALSE;
- }
-
-+ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+ {
-+ g_set_error (err, GCONF_ERROR,
-+ GCONF_ERROR_FAILED,
-+ _("Schema contains invalid UTF-8"));
-+ return FALSE;
-+ }
-+
- if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
- {
- g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
-
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+ g_return_val_if_fail (schema != NULL, NULL);
-+
-+ return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+ const char *string)
-+{
-+ if (REAL_SCHEMA (schema)->gettext_domain)
-+ {
-+ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+ }
-+ else
-+ return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
- g_return_val_if_fail (schema != NULL, NULL);
-
-- return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
-
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
- g_return_val_if_fail (schema != NULL, NULL);
-
-- return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
-
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- a/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400
-+++ b/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type
- GConfValueType type);
- void gconf_schema_set_locale (GConfSchema *sc,
- const gchar *locale);
-+void gconf_schema_set_gettext_domain (GConfSchema *sc,
-+ const gchar *domain);
- void gconf_schema_set_short_desc (GConfSchema *sc,
- const gchar *desc);
- void gconf_schema_set_long_desc (GConfSchema *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema);
- const char* gconf_schema_get_locale (const GConfSchema *schema);
-+const char* gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char* gconf_schema_get_short_desc (const GConfSchema *schema);
- const char* gconf_schema_get_long_desc (const GConfSchema *schema);
- const char* gconf_schema_get_owner (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- a/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400
-+++ b/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
- GConfValueType cdr_type;
- GConfValue* global_default;
- GHashTable* hash;
-+ gchar* gettext_domain;
- };
-
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
- else
- g_printerr (_("WARNING: empty <applyto> node"));
- }
-+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+ {
-+ tmp = (char *)xmlNodeGetContent(iter);
-+ if (tmp)
-+ {
-+ info->gettext_domain = g_strdup(tmp);
-+ xmlFree(tmp);
-+ }
-+ }
- else
- g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
- if (info->owner != NULL)
- gconf_schema_set_owner(schema, info->owner);
-
-+ if (info->gettext_domain != NULL)
-+ gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
- xmlFree(name);
-
- /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
- info.apply_to = NULL;
- info.owner = NULL;
- info.global_default = NULL;
-+ info.gettext_domain = NULL;
- info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-
- extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
- ; /* nothing */
- else if (strcmp((char *)iter->name, "applyto") == 0)
- ; /* nothing */
-+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+ ; /* nothing */
- else if (strcmp((char *)iter->name, "locale") == 0)
- {
- process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- a/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400
-+++ b/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
- string short_desc;
- string long_desc;
- string owner;
-+ string gettext_domain;
- // Work around lack of recursive data types
- string encoded_default_value;
- };
diff --git a/srcpkgs/GConf/patches/gconf-reload.patch b/srcpkgs/GConf/patches/gconf-reload.patch
deleted file mode 100644
index d88d33e380f46..0000000000000
--- a/srcpkgs/GConf/patches/gconf-reload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gconf/gconftool.c 2006-10-14 17:37:14.000000000 +0000
-+++ b/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-
- gconf_engine_unref (conf);
-
-+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
- return retval;
- }
-
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-
- gconf_engine_unref (conf);
-
-+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
- return retval;
- }
-
diff --git a/srcpkgs/GConf/patches/locale.patch b/srcpkgs/GConf/patches/locale.patch
deleted file mode 100644
index e01d1c38374a7..0000000000000
--- a/srcpkgs/GConf/patches/locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -18589,8 +18589,8 @@ fi
- DATADIRNAME=share
- ;;
- *)
-- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
- ;;
- esac
- fi
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
deleted file mode 100644
index 4365c11e58448..0000000000000
--- a/srcpkgs/GConf/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'GConf'
-pkgname=GConf
-version=3.2.6
-revision=11
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--without-openldap --enable-gtk --enable-defaults-service
- --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
- $(vopt_enable gir introspection)"
-conf_files="/etc/gconf/2/path"
-hostmakedepends="pkg-config intltool gtk-doc glib-devel gobject-introspection"
-makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
-depends="dconf"
-short_desc="Process-transparent configuration system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://projects.gnome.org/gconf"
-distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
-checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2
-make_dirs="/usr/share/gconf/schemas 0755 root root
- /etc/gconf/gconf.xml.defaults 0755 root root
- /etc/gconf/gconf.xml.mandatory 0755 root root
- /etc/gconf/gconf.xml.system 0755 root root"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-GConf-devel_package() {
- depends="glib-devel dbus-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- 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/share/sgml
- vmove usr/share/aclocal
- vmove usr/share/gtk-doc
- # Install gconf-merge-schema
- vbin ${FILESDIR}/gconf-merge-schema.sh gconf-merge-schema
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9ef3db7195a51..cb8d32ecff7fd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20230927
+version=0.1.20230930
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -12,6 +12,8 @@ replaces="
6cord<=9.6_1
Electron-Cash<=4.2.10_3
FeedReader<=2.11.0_2
+ GConf<=3.2.6_11
+ GConf-devel<=3.2.6_11
ImageMagick6<=6.9.12.12_2
Lidarr<=0.5.0.583_1
MoinMoin<=1.9.11_1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: remove gconf
2023-09-30 0:53 [PR PATCH] remove gconf CameronNemo
@ 2023-09-30 10:43 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2023-09-30 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1739 bytes --]
There's a merged pull request on the void-packages repository
remove gconf
https://github.com/void-linux/void-packages/pull/46334
Description:
Closes https://github.com/void-linux/void-packages/issues/17254
closes https://github.com/void-linux/void-packages/pull/46300
- qt6-location: rebuild without GConf-devel
- qt6-position: rebuild without GConf-devel
- upwork: remove
- GConf: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I installed qutebrowser with the rebuilt qt6-location/position packages and used DDG maps and tried to get my location. I was not running GeoClue so it spit out an error about that, but nothing shlibs related. I think the GeoClue error indicates the qt6-location code was loaded and invoked correctly? I don't see why qt6 would depend on GConf, that dependency seems to have been added by mistake.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-30 10:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-30 0:53 [PR PATCH] remove gconf CameronNemo
2023-09-30 10:43 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).