* [PR PATCH] gnome-doc-utils: remove
@ 2021-11-26 6:06 sgn
2021-11-26 7:56 ` [PR PATCH] [Updated] " sgn
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2021-11-26 6:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-doc-utils-remove
https://github.com/void-linux/void-packages/pull/34248
gnome-doc-utils: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34248.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-doc-utils-remove-34248.patch --]
[-- Type: text/x-diff, Size: 31551 bytes --]
From 32737bd2fcaba18fb21a72f14565c54cb48f9a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:01:25 +0700
Subject: [PATCH 1/4] gconf-editor: remove
---
srcpkgs/gconf-editor/template | 27 ---------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 srcpkgs/gconf-editor/template
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
deleted file mode 100644
index d4d9fa79bd25..000000000000
--- a/srcpkgs/gconf-editor/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'gconf-editor'
-pkgname=gconf-editor
-version=3.0.1
-revision=3
-build_style=gnu-configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
-makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
- hicolor-icon-theme desktop-file-utils gnome-doc-utils GConf-devel"
-depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
-short_desc="Graphical editor to maintain the Gnome registry"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
-post_install() {
- mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
- gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
- --domain ${pkgname} ${wrksrc}/*.schemas
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8b9aa9d8bdff..ef53eba7a92e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -67,6 +67,7 @@ replaces="
epstopdf<=2.27_3
fontmatrix<=0.6.0.20171228_2
fuse-usmb<=20130204_7
+ gconf-editor<=3.0.1_3
gegl3<=0.3.28_2
gens-gs<=2.16.7_2
geoip-data<=20171002_2
From 94d837433b61706bd8e728859570839a75ebbba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:16:56 +0700
Subject: [PATCH 2/4] gmpc: not require gnome-doc-utils for check
---
srcpkgs/gmpc/patches/locale-dir.patch | 20 +++++++++++++++++++
srcpkgs/gmpc/patches/no-mallard-check.patch | 22 +++++++++++++++++++++
srcpkgs/gmpc/template | 5 -----
3 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gmpc/patches/locale-dir.patch
create mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch
diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch
new file mode 100644
index 000000000000..8398823dd765
--- /dev/null
+++ b/srcpkgs/gmpc/patches/locale-dir.patch
@@ -0,0 +1,20 @@
+--- a/configure
++++ b/configure
+@@ -11347,7 +11347,7 @@ fi
+
+ ;;
+ *)
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
+@@ -15026,7 +15026,7 @@ fi
+ ;;
+ *)
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch
new file mode 100644
index 000000000000..f36891f28498
--- /dev/null
+++ b/srcpkgs/gmpc/patches/no-mallard-check.patch
@@ -0,0 +1,22 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+
+-SUBDIRS=Mallard
++SUBDIRS=
+
+ .PHONY: doc
+ doc: Manual.txt
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@
+ unique_LIBS = @unique_LIBS@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+-SUBDIRS = Mallard
++SUBDIRS =
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 9993e6c49dfa..ec0c03ade913 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -6,7 +6,6 @@ build_style=gnu-configure
hostmakedepends="pkg-config gob2 intltool vala"
makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
depends="xdg-utils hicolor-icon-theme"
-checkdepends="gnome-doc-utils"
short_desc="Gnome Music Player Client - The true MPD client"
maintainer="Dave Davenport <qball@gmpclient.org>"
license="GPL-2.0-or-later"
@@ -16,10 +15,6 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
LDFLAGS="-lm"
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
gmpc-devel_package() {
short_desc+=" - development files"
depends="gtk+-devel libmpd-devel"
From daeaeb4652908ed95891fc7d62e3e6cb2b623922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:03:18 +0700
Subject: [PATCH 3/4] gnac: disable old gnome-help format
---
srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 +++++++++++++++++++
srcpkgs/gnac/template | 6 +++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch
diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
new file mode 100644
index 000000000000..00f89a338dbc
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
+ dnl Check for GSettings macros
+ GLIB_GSETTINGS
+
+-GNOME_DOC_INIT([0.17.2])
++GNOME_DOC_INIT([0.17.2],[:],[:])
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ data \
+- help \
+ libgnac \
+ man \
+ po \
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index ad01a1e97f91..9fea6a370e87 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -1,15 +1,15 @@
# Template file for 'gnac'
pkgname=gnac
version=0.2.4.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-scrollkeeper --disable-schemas-compile"
hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool
- gnome-doc-utils glib-devel gtk+3-devel gst-plugins-base1-devel
+ glib-devel gtk+3-devel gst-plugins-base1-devel
autoconf-archive which"
makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel
libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
- desktop-file-utils hicolor-icon-theme gnome-doc-utils"
+ desktop-file-utils hicolor-icon-theme"
depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
desktop-file-utils hicolor-icon-theme"
short_desc="Audio conversion program for the Gnome desktop"
From 88aef726d53973577b888d5ae3a9e84ebffd02a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:05:33 +0700
Subject: [PATCH 4/4] gnome-doc-utils: remove
---
srcpkgs/gnome-doc-utils/patches/python3.patch | 521 ------------------
srcpkgs/gnome-doc-utils/template | 21 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 542 deletions(-)
delete mode 100644 srcpkgs/gnome-doc-utils/patches/python3.patch
delete mode 100644 srcpkgs/gnome-doc-utils/template
diff --git a/srcpkgs/gnome-doc-utils/patches/python3.patch b/srcpkgs/gnome-doc-utils/patches/python3.patch
deleted file mode 100644
index 284e38e775de..000000000000
--- a/srcpkgs/gnome-doc-utils/patches/python3.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-taken from fedora, alpine, gentoo
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500
-@@ -86,14 +86,14 @@
- self.messages.append(t)
- if spacepreserve:
- self.nowrap[t] = True
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
- if (not self.do_translations) and comment and not t in self.comments:
- self.comments[t] = comment
- else:
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.next
-+ child = child.__next__
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -200,7 +200,7 @@
- tree = ctxt.doc()
- newnode = tree.getRootElement()
- except:
-- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
-+ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
- return text
-
- self.normalizeNode(newnode)
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.next
-+ newnode = tree.children.__next__
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.next
-+ child = child.__next__
- else:
- result = node.serialize('utf-8')
- return result
-@@ -338,7 +338,7 @@
- pass
-
- if not newnode:
-- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
-+ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
- return
-
- newelem = newnode.getRootElement()
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.next
-+ next = free.__next__
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ next = node.__next__
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.next
-+ child = child.__next__
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
- return outtxt
-
- def xml_error_handler(arg, ctxt):
-@@ -577,8 +577,8 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
-+ except Exception as e:
-+ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
- sys.exit(1)
- self.current_mode.preProcessXml(doc.doc, self.msg)
- doc.generate_messages()
-@@ -590,14 +590,14 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
-
- try:
- mfile = open(mofile, "rb")
- except:
-- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
- self.gt = gettext.GNUTranslations(mfile)
- self.gt.add_fallback(NoneTranslations())
- # Has preProcessXml use cases for merge?
-@@ -619,16 +619,16 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
-
- self.msg.translationsFollow()
- try:
- doc = XMLDocument(origxml, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
- self.output_po()
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500
-@@ -43,7 +43,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class docbookXmlMode(basicXmlMode):
- """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-@@ -198,10 +198,10 @@
- # Perform some tests when ran standalone
- if __name__ == '__main__':
- test = docbookXmlMode()
-- print "Ignored tags : " + repr(test.getIgnoredTags())
-- print "Final tags : " + repr(test.getFinalTags())
-- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+ print("Ignored tags : " + repr(test.getIgnoredTags()))
-+ print("Final tags : " + repr(test.getFinalTags()))
-+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
-
-- print "Credits from string: '%s'" % test.getStringForTranslators()
-- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+ print("Credits from string: '%s'" % test.getStringForTranslators())
-+ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
-
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500
-@@ -20,7 +20,7 @@
- # Special case Gnome Summary
- #
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class gsXmlMode(basicXmlMode):
- """Abstract class for special handling of document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500
-@@ -39,7 +39,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class mallardXmlMode(basicXmlMode):
- """Class for special handling of Mallard document types."""
-@@ -112,7 +112,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500
-@@ -2,7 +2,7 @@
-
- import libxml2
-
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
-
- class ubuntuXmlMode (docbookXmlMode):
- """Special-casing Ubuntu DocBook website documentation."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500
-@@ -21,7 +21,7 @@
- # This implements special instructions for handling XHTML documents
- # in a better way, particularly to extract some attributes in HTML tags
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class xhtmlXmlMode(basicXmlMode):
- """Class for special handling of XHTML document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500
-@@ -41,9 +41,9 @@
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
-
- def usage (with_help = False):
-- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
- if with_help:
-- print >> sys.stderr, """
-+ print("""
- OPTIONS may be some of:
- -a --automatic-tags Automatically decides if tags are to be considered
- "final" or not
-@@ -72,7 +72,7 @@
- using -p option for each XML file:
- %(command)s -p de.po chapter1.xml > chapter1.de.xml
- %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
-
-
- def main(argv):
-@@ -82,7 +82,7 @@
-
- name = os.path.join(os.path.dirname(__file__), '..')
- if os.path.exists(os.path.join(name, 'tests')):
-- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
-+ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
- sys.path.insert(0, name)
-
- from xml2po import Main
-@@ -142,14 +142,14 @@
- elif opt in ('-o', '--output'):
- output = arg
- elif opt in ('-v', '--version'):
-- print VERSION
-+ print(VERSION)
- sys.exit(0)
- elif opt in ('-h', '--help'):
- usage(True)
- sys.exit(0)
-
- if operation == 'update' and output != "-":
-- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
-+ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
-
- # Treat remaining arguments as XML files
- filenames = []
-@@ -159,16 +159,16 @@
- try:
- xml2po_main = Main(default_mode, operation, output, options)
- except IOError:
-- print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
-+ print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
- sys.exit(5)
-
- if operation == 'merge':
- if len(filenames) > 1:
-- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
-+ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
- sys.exit(2)
-
- if not mofile:
-- print >> sys.stderr, "Error: You must specify MO file when merging translations."
-+ print("Error: You must specify MO file when merging translations.", file=sys.stderr)
- sys.exit(3)
-
- xml2po_main.merge(mofile, filenames[0])
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.__next__
-+ child = child.next
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.__next__
-+ newnode = tree.children.next
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.__next__
-+ child = child.next
- else:
- result = node.serialize('utf-8')
- return result
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.__next__
-+ next = free.next
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.__next__
-+ next = node.next
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.__next__
-+ child = child.next
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
- return outtxt
-
- def xml_error_handler(arg, ctxt):
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500
-@@ -326,7 +326,7 @@
- pass
-
- content = '<%s>%s</%s>' % (starttag, text, endtag)
-- tmp = tmp + content.encode('utf-8')
-+ tmp = tmp + content
-
- newnode = None
- try:
-@@ -663,7 +663,7 @@
- if not text or text.strip() == '':
- return text
- if self.gt:
-- res = self.gt.ugettext(text.decode('utf-8'))
-+ res = self.gt.gettext(text)
- return res
-
- return text
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500
-@@ -352,9 +352,10 @@
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ #next = node.next
- node.replaceNode(newelem.copyNodeList())
-- node.next = next
-+ #print(type(next))
-+ #node.next = next
-
- else:
- # In practice, this happens with tags such as "<para> </para>" (only whitespace in between)
-@@ -470,7 +471,7 @@
-
- worth = self.worthOutputting(node)
- if not translation:
-- translation = outtxt.decode('utf-8')
-+ translation = outtxt
- if worth and self.app.options.get('mark_untranslated'):
- node.setLang('C')
-
---- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500
-@@ -184,7 +184,7 @@
- else:
- ai.addChild(copy)
- if match.group(3):
-- copy.newChild(None, "year", match.group(3).encode('utf-8'))
-+ copy.newChild(None, "year", match.group(3))
- if match.group(1) and match.group(2):
- holder = match.group(1)+"(%s)" % match.group(2)
- elif match.group(1):
-@@ -193,7 +193,7 @@
- holder = match.group(2)
- else:
- holder = "???"
-- copy.newChild(None, "holder", holder.encode('utf-8'))
-+ copy.newChild(None, "holder", holder)
-
- # Perform some tests when ran standalone
- if __name__ == '__main__':
---- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/python3 -u
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
deleted file mode 100644
index f63c6106f6c1..000000000000
--- a/srcpkgs/gnome-doc-utils/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gnome-doc-utils'
-pkgname=gnome-doc-utils
-version=0.20.10
-revision=9
-build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
-hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
- gsettings-desktop-schemas"
-makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
- libxml2-python3 libxslt"
-depends="libxslt docbook-xml docbook-xsl rarian python3 libxml2-python3"
-short_desc="Documentation utilities for GNOME"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
-distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
-checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ef53eba7a92e..2b16ae44131f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
gespeaker<=0.8.6_3
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
+ gnome-doc-utils<=0.20.10_9
gnome-getting-started-docs<=3.38.1_1
gnome-shell-mousewheel-zoom<=0.8.0_2
gnome-twitch<=0.4.2_1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] gnome-doc-utils: remove
2021-11-26 6:06 [PR PATCH] gnome-doc-utils: remove sgn
@ 2021-11-26 7:56 ` sgn
2021-11-26 11:25 ` sgn
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-11-26 7:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-doc-utils-remove
https://github.com/void-linux/void-packages/pull/34248
gnome-doc-utils: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34248.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-doc-utils-remove-34248.patch --]
[-- Type: text/x-diff, Size: 32101 bytes --]
From 32737bd2fcaba18fb21a72f14565c54cb48f9a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:01:25 +0700
Subject: [PATCH 1/4] gconf-editor: remove
---
srcpkgs/gconf-editor/template | 27 ---------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 srcpkgs/gconf-editor/template
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
deleted file mode 100644
index d4d9fa79bd25..000000000000
--- a/srcpkgs/gconf-editor/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'gconf-editor'
-pkgname=gconf-editor
-version=3.0.1
-revision=3
-build_style=gnu-configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
-makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
- hicolor-icon-theme desktop-file-utils gnome-doc-utils GConf-devel"
-depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
-short_desc="Graphical editor to maintain the Gnome registry"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
-post_install() {
- mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
- gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
- --domain ${pkgname} ${wrksrc}/*.schemas
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8b9aa9d8bdff..ef53eba7a92e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -67,6 +67,7 @@ replaces="
epstopdf<=2.27_3
fontmatrix<=0.6.0.20171228_2
fuse-usmb<=20130204_7
+ gconf-editor<=3.0.1_3
gegl3<=0.3.28_2
gens-gs<=2.16.7_2
geoip-data<=20171002_2
From 94d837433b61706bd8e728859570839a75ebbba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:16:56 +0700
Subject: [PATCH 2/4] gmpc: not require gnome-doc-utils for check
---
srcpkgs/gmpc/patches/locale-dir.patch | 20 +++++++++++++++++++
srcpkgs/gmpc/patches/no-mallard-check.patch | 22 +++++++++++++++++++++
srcpkgs/gmpc/template | 5 -----
3 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gmpc/patches/locale-dir.patch
create mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch
diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch
new file mode 100644
index 000000000000..8398823dd765
--- /dev/null
+++ b/srcpkgs/gmpc/patches/locale-dir.patch
@@ -0,0 +1,20 @@
+--- a/configure
++++ b/configure
+@@ -11347,7 +11347,7 @@ fi
+
+ ;;
+ *)
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
+@@ -15026,7 +15026,7 @@ fi
+ ;;
+ *)
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch
new file mode 100644
index 000000000000..f36891f28498
--- /dev/null
+++ b/srcpkgs/gmpc/patches/no-mallard-check.patch
@@ -0,0 +1,22 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+
+-SUBDIRS=Mallard
++SUBDIRS=
+
+ .PHONY: doc
+ doc: Manual.txt
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@
+ unique_LIBS = @unique_LIBS@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+-SUBDIRS = Mallard
++SUBDIRS =
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 9993e6c49dfa..ec0c03ade913 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -6,7 +6,6 @@ build_style=gnu-configure
hostmakedepends="pkg-config gob2 intltool vala"
makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
depends="xdg-utils hicolor-icon-theme"
-checkdepends="gnome-doc-utils"
short_desc="Gnome Music Player Client - The true MPD client"
maintainer="Dave Davenport <qball@gmpclient.org>"
license="GPL-2.0-or-later"
@@ -16,10 +15,6 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
LDFLAGS="-lm"
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
gmpc-devel_package() {
short_desc+=" - development files"
depends="gtk+-devel libmpd-devel"
From d2a8ed8475414706814ae7ecfcc54fd85d317af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:03:18 +0700
Subject: [PATCH 3/4] gnac: disable old gnome-help format
---
srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 +++++++++++++++++++
srcpkgs/gnac/patches/no-po-check.patch | 7 +++++++
srcpkgs/gnac/template | 6 +++---
3 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch
create mode 100644 srcpkgs/gnac/patches/no-po-check.patch
diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
new file mode 100644
index 000000000000..00f89a338dbc
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
+ dnl Check for GSettings macros
+ GLIB_GSETTINGS
+
+-GNOME_DOC_INIT([0.17.2])
++GNOME_DOC_INIT([0.17.2],[:],[:])
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ data \
+- help \
+ libgnac \
+ man \
+ po \
diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch
new file mode 100644
index 000000000000..bf1ddb4a9e7d
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-po-check.patch
@@ -0,0 +1,7 @@
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,3 +1,4 @@
+ # List of source files that should NOT be translated.
+ # Please keep this file sorted alphabetically.
+ data/gnac.desktop.in
++intl/plural.c
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index ad01a1e97f91..9fea6a370e87 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -1,15 +1,15 @@
# Template file for 'gnac'
pkgname=gnac
version=0.2.4.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-scrollkeeper --disable-schemas-compile"
hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool
- gnome-doc-utils glib-devel gtk+3-devel gst-plugins-base1-devel
+ glib-devel gtk+3-devel gst-plugins-base1-devel
autoconf-archive which"
makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel
libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
- desktop-file-utils hicolor-icon-theme gnome-doc-utils"
+ desktop-file-utils hicolor-icon-theme"
depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
desktop-file-utils hicolor-icon-theme"
short_desc="Audio conversion program for the Gnome desktop"
From 97f0d232fad0928ba03f08136883c3fc6a9be5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:05:33 +0700
Subject: [PATCH 4/4] gnome-doc-utils: remove
---
srcpkgs/gnome-doc-utils/patches/python3.patch | 521 ------------------
srcpkgs/gnome-doc-utils/template | 21 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 542 deletions(-)
delete mode 100644 srcpkgs/gnome-doc-utils/patches/python3.patch
delete mode 100644 srcpkgs/gnome-doc-utils/template
diff --git a/srcpkgs/gnome-doc-utils/patches/python3.patch b/srcpkgs/gnome-doc-utils/patches/python3.patch
deleted file mode 100644
index 284e38e775de..000000000000
--- a/srcpkgs/gnome-doc-utils/patches/python3.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-taken from fedora, alpine, gentoo
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500
-@@ -86,14 +86,14 @@
- self.messages.append(t)
- if spacepreserve:
- self.nowrap[t] = True
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
- if (not self.do_translations) and comment and not t in self.comments:
- self.comments[t] = comment
- else:
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.next
-+ child = child.__next__
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -200,7 +200,7 @@
- tree = ctxt.doc()
- newnode = tree.getRootElement()
- except:
-- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
-+ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
- return text
-
- self.normalizeNode(newnode)
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.next
-+ newnode = tree.children.__next__
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.next
-+ child = child.__next__
- else:
- result = node.serialize('utf-8')
- return result
-@@ -338,7 +338,7 @@
- pass
-
- if not newnode:
-- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
-+ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
- return
-
- newelem = newnode.getRootElement()
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.next
-+ next = free.__next__
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ next = node.__next__
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.next
-+ child = child.__next__
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
- return outtxt
-
- def xml_error_handler(arg, ctxt):
-@@ -577,8 +577,8 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
-+ except Exception as e:
-+ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
- sys.exit(1)
- self.current_mode.preProcessXml(doc.doc, self.msg)
- doc.generate_messages()
-@@ -590,14 +590,14 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
-
- try:
- mfile = open(mofile, "rb")
- except:
-- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
- self.gt = gettext.GNUTranslations(mfile)
- self.gt.add_fallback(NoneTranslations())
- # Has preProcessXml use cases for merge?
-@@ -619,16 +619,16 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
-
- self.msg.translationsFollow()
- try:
- doc = XMLDocument(origxml, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
- self.output_po()
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500
-@@ -43,7 +43,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class docbookXmlMode(basicXmlMode):
- """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-@@ -198,10 +198,10 @@
- # Perform some tests when ran standalone
- if __name__ == '__main__':
- test = docbookXmlMode()
-- print "Ignored tags : " + repr(test.getIgnoredTags())
-- print "Final tags : " + repr(test.getFinalTags())
-- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+ print("Ignored tags : " + repr(test.getIgnoredTags()))
-+ print("Final tags : " + repr(test.getFinalTags()))
-+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
-
-- print "Credits from string: '%s'" % test.getStringForTranslators()
-- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+ print("Credits from string: '%s'" % test.getStringForTranslators())
-+ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
-
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500
-@@ -20,7 +20,7 @@
- # Special case Gnome Summary
- #
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class gsXmlMode(basicXmlMode):
- """Abstract class for special handling of document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500
-@@ -39,7 +39,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class mallardXmlMode(basicXmlMode):
- """Class for special handling of Mallard document types."""
-@@ -112,7 +112,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500
-@@ -2,7 +2,7 @@
-
- import libxml2
-
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
-
- class ubuntuXmlMode (docbookXmlMode):
- """Special-casing Ubuntu DocBook website documentation."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500
-@@ -21,7 +21,7 @@
- # This implements special instructions for handling XHTML documents
- # in a better way, particularly to extract some attributes in HTML tags
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class xhtmlXmlMode(basicXmlMode):
- """Class for special handling of XHTML document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500
-@@ -41,9 +41,9 @@
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
-
- def usage (with_help = False):
-- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
- if with_help:
-- print >> sys.stderr, """
-+ print("""
- OPTIONS may be some of:
- -a --automatic-tags Automatically decides if tags are to be considered
- "final" or not
-@@ -72,7 +72,7 @@
- using -p option for each XML file:
- %(command)s -p de.po chapter1.xml > chapter1.de.xml
- %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
-
-
- def main(argv):
-@@ -82,7 +82,7 @@
-
- name = os.path.join(os.path.dirname(__file__), '..')
- if os.path.exists(os.path.join(name, 'tests')):
-- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
-+ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
- sys.path.insert(0, name)
-
- from xml2po import Main
-@@ -142,14 +142,14 @@
- elif opt in ('-o', '--output'):
- output = arg
- elif opt in ('-v', '--version'):
-- print VERSION
-+ print(VERSION)
- sys.exit(0)
- elif opt in ('-h', '--help'):
- usage(True)
- sys.exit(0)
-
- if operation == 'update' and output != "-":
-- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
-+ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
-
- # Treat remaining arguments as XML files
- filenames = []
-@@ -159,16 +159,16 @@
- try:
- xml2po_main = Main(default_mode, operation, output, options)
- except IOError:
-- print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
-+ print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
- sys.exit(5)
-
- if operation == 'merge':
- if len(filenames) > 1:
-- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
-+ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
- sys.exit(2)
-
- if not mofile:
-- print >> sys.stderr, "Error: You must specify MO file when merging translations."
-+ print("Error: You must specify MO file when merging translations.", file=sys.stderr)
- sys.exit(3)
-
- xml2po_main.merge(mofile, filenames[0])
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.__next__
-+ child = child.next
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.__next__
-+ newnode = tree.children.next
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.__next__
-+ child = child.next
- else:
- result = node.serialize('utf-8')
- return result
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.__next__
-+ next = free.next
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.__next__
-+ next = node.next
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.__next__
-+ child = child.next
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
- return outtxt
-
- def xml_error_handler(arg, ctxt):
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500
-@@ -326,7 +326,7 @@
- pass
-
- content = '<%s>%s</%s>' % (starttag, text, endtag)
-- tmp = tmp + content.encode('utf-8')
-+ tmp = tmp + content
-
- newnode = None
- try:
-@@ -663,7 +663,7 @@
- if not text or text.strip() == '':
- return text
- if self.gt:
-- res = self.gt.ugettext(text.decode('utf-8'))
-+ res = self.gt.gettext(text)
- return res
-
- return text
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500
-@@ -352,9 +352,10 @@
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ #next = node.next
- node.replaceNode(newelem.copyNodeList())
-- node.next = next
-+ #print(type(next))
-+ #node.next = next
-
- else:
- # In practice, this happens with tags such as "<para> </para>" (only whitespace in between)
-@@ -470,7 +471,7 @@
-
- worth = self.worthOutputting(node)
- if not translation:
-- translation = outtxt.decode('utf-8')
-+ translation = outtxt
- if worth and self.app.options.get('mark_untranslated'):
- node.setLang('C')
-
---- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500
-@@ -184,7 +184,7 @@
- else:
- ai.addChild(copy)
- if match.group(3):
-- copy.newChild(None, "year", match.group(3).encode('utf-8'))
-+ copy.newChild(None, "year", match.group(3))
- if match.group(1) and match.group(2):
- holder = match.group(1)+"(%s)" % match.group(2)
- elif match.group(1):
-@@ -193,7 +193,7 @@
- holder = match.group(2)
- else:
- holder = "???"
-- copy.newChild(None, "holder", holder.encode('utf-8'))
-+ copy.newChild(None, "holder", holder)
-
- # Perform some tests when ran standalone
- if __name__ == '__main__':
---- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/python3 -u
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
deleted file mode 100644
index f63c6106f6c1..000000000000
--- a/srcpkgs/gnome-doc-utils/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gnome-doc-utils'
-pkgname=gnome-doc-utils
-version=0.20.10
-revision=9
-build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
-hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
- gsettings-desktop-schemas"
-makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
- libxml2-python3 libxslt"
-depends="libxslt docbook-xml docbook-xsl rarian python3 libxml2-python3"
-short_desc="Documentation utilities for GNOME"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
-distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
-checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ef53eba7a92e..2b16ae44131f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
gespeaker<=0.8.6_3
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
+ gnome-doc-utils<=0.20.10_9
gnome-getting-started-docs<=3.38.1_1
gnome-shell-mousewheel-zoom<=0.8.0_2
gnome-twitch<=0.4.2_1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: gnome-doc-utils: remove
2021-11-26 6:06 [PR PATCH] gnome-doc-utils: remove sgn
2021-11-26 7:56 ` [PR PATCH] [Updated] " sgn
@ 2021-11-26 11:25 ` sgn
2021-12-01 9:58 ` [PR PATCH] [Updated] " sgn
2021-12-01 10:12 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-11-26 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/34248#issuecomment-979903274
Comment:
- `gnac` hangs on startup on musl, old version also hangs, so I dun know.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] gnome-doc-utils: remove
2021-11-26 6:06 [PR PATCH] gnome-doc-utils: remove sgn
2021-11-26 7:56 ` [PR PATCH] [Updated] " sgn
2021-11-26 11:25 ` sgn
@ 2021-12-01 9:58 ` sgn
2021-12-01 10:12 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-12-01 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages gnome-doc-utils-remove
https://github.com/void-linux/void-packages/pull/34248
gnome-doc-utils: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34248.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-doc-utils-remove-34248.patch --]
[-- Type: text/x-diff, Size: 33797 bytes --]
From ed9fa20868fc68243957ca2758f497c3ee103f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:01:25 +0700
Subject: [PATCH 1/4] gconf-editor: remove
---
srcpkgs/gconf-editor/template | 27 ---------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 srcpkgs/gconf-editor/template
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
deleted file mode 100644
index d4d9fa79bd25..000000000000
--- a/srcpkgs/gconf-editor/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'gconf-editor'
-pkgname=gconf-editor
-version=3.0.1
-revision=3
-build_style=gnu-configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
-makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
- hicolor-icon-theme desktop-file-utils gnome-doc-utils GConf-devel"
-depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
-short_desc="Graphical editor to maintain the Gnome registry"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
-post_install() {
- mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
- gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
- --domain ${pkgname} ${wrksrc}/*.schemas
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8b9aa9d8bdff..ef53eba7a92e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -67,6 +67,7 @@ replaces="
epstopdf<=2.27_3
fontmatrix<=0.6.0.20171228_2
fuse-usmb<=20130204_7
+ gconf-editor<=3.0.1_3
gegl3<=0.3.28_2
gens-gs<=2.16.7_2
geoip-data<=20171002_2
From 9ad719ccbe15c8264443d8285df6550000fef693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 12:16:56 +0700
Subject: [PATCH 2/4] gmpc: not require gnome-doc-utils for check
---
srcpkgs/gmpc/patches/locale-dir.patch | 20 +++++++++++++++++++
srcpkgs/gmpc/patches/no-mallard-check.patch | 22 +++++++++++++++++++++
srcpkgs/gmpc/template | 5 -----
3 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gmpc/patches/locale-dir.patch
create mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch
diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch
new file mode 100644
index 000000000000..8398823dd765
--- /dev/null
+++ b/srcpkgs/gmpc/patches/locale-dir.patch
@@ -0,0 +1,20 @@
+--- a/configure
++++ b/configure
+@@ -11347,7 +11347,7 @@ fi
+
+ ;;
+ *)
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
+@@ -15026,7 +15026,7 @@ fi
+ ;;
+ *)
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch
new file mode 100644
index 000000000000..f36891f28498
--- /dev/null
+++ b/srcpkgs/gmpc/patches/no-mallard-check.patch
@@ -0,0 +1,22 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+
+-SUBDIRS=Mallard
++SUBDIRS=
+
+ .PHONY: doc
+ doc: Manual.txt
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@
+ unique_LIBS = @unique_LIBS@
+ man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
+ EXTRA_DIST = $(man_MANS)
+-SUBDIRS = Mallard
++SUBDIRS =
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 9993e6c49dfa..ec0c03ade913 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -6,7 +6,6 @@ build_style=gnu-configure
hostmakedepends="pkg-config gob2 intltool vala"
makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
depends="xdg-utils hicolor-icon-theme"
-checkdepends="gnome-doc-utils"
short_desc="Gnome Music Player Client - The true MPD client"
maintainer="Dave Davenport <qball@gmpclient.org>"
license="GPL-2.0-or-later"
@@ -16,10 +15,6 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
LDFLAGS="-lm"
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
-
gmpc-devel_package() {
short_desc+=" - development files"
depends="gtk+-devel libmpd-devel"
From 02aabfa8f627858c58cbe05dd349c2e0c8cefad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:03:18 +0700
Subject: [PATCH 3/4] gnac: disable old gnome-help format
---
srcpkgs/gnac/patches/fix-debug-log.patch | 29 +++++++++++++++++++
srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 +++++++++++++
srcpkgs/gnac/patches/no-po-check.patch | 7 +++++
srcpkgs/gnac/template | 6 ++--
4 files changed, 59 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnac/patches/fix-debug-log.patch
create mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch
create mode 100644 srcpkgs/gnac/patches/no-po-check.patch
diff --git a/srcpkgs/gnac/patches/fix-debug-log.patch b/srcpkgs/gnac/patches/fix-debug-log.patch
new file mode 100644
index 000000000000..88fd15de6a56
--- /dev/null
+++ b/srcpkgs/gnac/patches/fix-debug-log.patch
@@ -0,0 +1,29 @@
+--- a/libgnac/libgnac-debug.h
++++ b/libgnac/libgnac-debug.h
+@@ -32,7 +32,7 @@
+
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_debug(...) \
+- libgnac_debug_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++ libgnac_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_debug(...) \
+ libgnac_debug_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+@@ -42,7 +42,7 @@
+
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_warning(...) \
+- libgnac_warning_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++ libgnac_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_warning(...) \
+ libgnac_warning_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+@@ -52,7 +52,7 @@
+
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_critical(...) \
+- libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++ libgnac_critical_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_critical(...) \
+ libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
new file mode 100644
index 000000000000..00f89a338dbc
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT
+ dnl Check for GSettings macros
+ GLIB_GSETTINGS
+
+-GNOME_DOC_INIT([0.17.2])
++GNOME_DOC_INIT([0.17.2],[:],[:])
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ data \
+- help \
+ libgnac \
+ man \
+ po \
diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch
new file mode 100644
index 000000000000..bf1ddb4a9e7d
--- /dev/null
+++ b/srcpkgs/gnac/patches/no-po-check.patch
@@ -0,0 +1,7 @@
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,3 +1,4 @@
+ # List of source files that should NOT be translated.
+ # Please keep this file sorted alphabetically.
+ data/gnac.desktop.in
++intl/plural.c
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index ad01a1e97f91..9fea6a370e87 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -1,15 +1,15 @@
# Template file for 'gnac'
pkgname=gnac
version=0.2.4.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-scrollkeeper --disable-schemas-compile"
hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool
- gnome-doc-utils glib-devel gtk+3-devel gst-plugins-base1-devel
+ glib-devel gtk+3-devel gst-plugins-base1-devel
autoconf-archive which"
makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel
libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
- desktop-file-utils hicolor-icon-theme gnome-doc-utils"
+ desktop-file-utils hicolor-icon-theme"
depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1
desktop-file-utils hicolor-icon-theme"
short_desc="Audio conversion program for the Gnome desktop"
From f8f62078154b977a68995bd62eba8ecd9c10cfc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Nov 2021 13:05:33 +0700
Subject: [PATCH 4/4] gnome-doc-utils: remove
---
srcpkgs/gnome-doc-utils/patches/python3.patch | 521 ------------------
srcpkgs/gnome-doc-utils/template | 21 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 542 deletions(-)
delete mode 100644 srcpkgs/gnome-doc-utils/patches/python3.patch
delete mode 100644 srcpkgs/gnome-doc-utils/template
diff --git a/srcpkgs/gnome-doc-utils/patches/python3.patch b/srcpkgs/gnome-doc-utils/patches/python3.patch
deleted file mode 100644
index 284e38e775de..000000000000
--- a/srcpkgs/gnome-doc-utils/patches/python3.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-taken from fedora, alpine, gentoo
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py 2011-08-04 09:36:03.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:30:28.018627919 -0500
-@@ -86,14 +86,14 @@
- self.messages.append(t)
- if spacepreserve:
- self.nowrap[t] = True
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
- if (not self.do_translations) and comment and not t in self.comments:
- self.comments[t] = comment
- else:
-- if t in self.linenos.keys():
-+ if t in list(self.linenos.keys()):
- self.linenos[t].append((self.filename, tag, lineno))
- else:
- self.linenos[t] = [ (self.filename, tag, lineno) ]
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.next
-+ child = child.__next__
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -200,7 +200,7 @@
- tree = ctxt.doc()
- newnode = tree.getRootElement()
- except:
-- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
-+ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
- return text
-
- self.normalizeNode(newnode)
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.next
-+ newnode = tree.children.__next__
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.next
-+ child = child.__next__
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.next
-+ child = child.__next__
- else:
- result = node.serialize('utf-8')
- return result
-@@ -338,7 +338,7 @@
- pass
-
- if not newnode:
-- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
-+ print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
- return
-
- newelem = newnode.getRootElement()
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.next
-+ next = free.__next__
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ next = node.__next__
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.next
-+ child = child.__next__
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.next
-+ child = child.__next__
- return outtxt
-
- def xml_error_handler(arg, ctxt):
-@@ -577,8 +577,8 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
-+ except Exception as e:
-+ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
- sys.exit(1)
- self.current_mode.preProcessXml(doc.doc, self.msg)
- doc.generate_messages()
-@@ -590,14 +590,14 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
-
- try:
- mfile = open(mofile, "rb")
- except:
-- print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
-+ print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
- self.gt = gettext.GNUTranslations(mfile)
- self.gt.add_fallback(NoneTranslations())
- # Has preProcessXml use cases for merge?
-@@ -619,16 +619,16 @@
- raise IOError("Unable to read file '%s'" % xmlfile)
- try:
- doc = XMLDocument(xmlfile, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
-
- self.msg.translationsFollow()
- try:
- doc = XMLDocument(origxml, self)
-- except Exception, e:
-- print >> sys.stderr, str(e)
-+ except Exception as e:
-+ print(str(e), file=sys.stderr)
- sys.exit(1)
- doc.generate_messages()
- self.output_po()
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py 2011-01-10 10:08:10.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:31:15.199572286 -0500
-@@ -43,7 +43,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class docbookXmlMode(basicXmlMode):
- """Class for special handling of DocBook document types.
-@@ -131,7 +131,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-@@ -198,10 +198,10 @@
- # Perform some tests when ran standalone
- if __name__ == '__main__':
- test = docbookXmlMode()
-- print "Ignored tags : " + repr(test.getIgnoredTags())
-- print "Final tags : " + repr(test.getFinalTags())
-- print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
-+ print("Ignored tags : " + repr(test.getIgnoredTags()))
-+ print("Final tags : " + repr(test.getFinalTags()))
-+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
-
-- print "Credits from string: '%s'" % test.getStringForTranslators()
-- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
-+ print("Credits from string: '%s'" % test.getStringForTranslators())
-+ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
-
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py 2019-09-10 09:31:15.201572284 -0500
-@@ -20,7 +20,7 @@
- # Special case Gnome Summary
- #
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class gsXmlMode(basicXmlMode):
- """Abstract class for special handling of document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py 2011-01-10 10:08:50.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py 2019-09-10 09:31:15.212572271 -0500
-@@ -39,7 +39,7 @@
- except ImportError:
- from md5 import new as md5_new
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class mallardXmlMode(basicXmlMode):
- """Class for special handling of Mallard document types."""
-@@ -112,7 +112,7 @@
- hash = self._md5_for_file(fullpath)
- else:
- hash = "THIS FILE DOESN'T EXIST"
-- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
-+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
-
- msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
- "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py 2019-09-10 09:31:15.213572270 -0500
-@@ -2,7 +2,7 @@
-
- import libxml2
-
--from docbook import docbookXmlMode
-+from .docbook import docbookXmlMode
-
- class ubuntuXmlMode (docbookXmlMode):
- """Special-casing Ubuntu DocBook website documentation."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py 2019-09-10 09:31:15.214572269 -0500
-@@ -21,7 +21,7 @@
- # This implements special instructions for handling XHTML documents
- # in a better way, particularly to extract some attributes in HTML tags
-
--from basic import basicXmlMode
-+from .basic import basicXmlMode
-
- class xhtmlXmlMode(basicXmlMode):
- """Class for special handling of XHTML document types."""
-diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
---- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in 2010-12-13 10:14:07.000000000 -0600
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:30:28.217627684 -0500
-@@ -41,9 +41,9 @@
- if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
-
- def usage (with_help = False):
-- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
-+ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
- if with_help:
-- print >> sys.stderr, """
-+ print("""
- OPTIONS may be some of:
- -a --automatic-tags Automatically decides if tags are to be considered
- "final" or not
-@@ -72,7 +72,7 @@
- using -p option for each XML file:
- %(command)s -p de.po chapter1.xml > chapter1.de.xml
- %(command)s -p de.po chapter2.xml > chapter2.de.xml
--""" % {'command': sys.argv[0]}
-+""" % {'command': sys.argv[0]}, file=sys.stderr)
-
-
- def main(argv):
-@@ -82,7 +82,7 @@
-
- name = os.path.join(os.path.dirname(__file__), '..')
- if os.path.exists(os.path.join(name, 'tests')):
-- print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
-+ print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
- sys.path.insert(0, name)
-
- from xml2po import Main
-@@ -142,14 +142,14 @@
- elif opt in ('-o', '--output'):
- output = arg
- elif opt in ('-v', '--version'):
-- print VERSION
-+ print(VERSION)
- sys.exit(0)
- elif opt in ('-h', '--help'):
- usage(True)
- sys.exit(0)
-
- if operation == 'update' and output != "-":
-- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
-+ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
-
- # Treat remaining arguments as XML files
- filenames = []
-@@ -159,16 +159,16 @@
- try:
- xml2po_main = Main(default_mode, operation, output, options)
- except IOError:
-- print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
-+ print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
- sys.exit(5)
-
- if operation == 'merge':
- if len(filenames) > 1:
-- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
-+ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
- sys.exit(2)
-
- if not mofile:
-- print >> sys.stderr, "Error: You must specify MO file when merging translations."
-+ print("Error: You must specify MO file when merging translations.", file=sys.stderr)
- sys.exit(3)
-
- xml2po_main.merge(mofile, filenames[0])
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:34:42.110328324 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:34:44.170325899 -0500
-@@ -166,7 +166,7 @@
- elif node.isText():
- if node.isBlankNode():
- if self.app.options.get('expand_entities') or \
-- (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
-+ (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
- #print >>sys.stderr, "BLANK"
- node.setContent('')
- else:
-@@ -176,7 +176,7 @@
- child = node.children
- while child:
- self.normalizeNode(child)
-- child = child.__next__
-+ child = child.next
-
- def normalizeString(self, text, spacepreserve = False):
- """Normalizes string to be used as key for gettext lookup.
-@@ -209,7 +209,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
-
- result = re.sub('^ ','', result)
- result = re.sub(' $','', result)
-@@ -235,7 +235,7 @@
- ctxt.parseDocument()
- tree = ctxt.doc()
- if next:
-- newnode = tree.children.__next__
-+ newnode = tree.children.next
- else:
- newnode = tree.children
-
-@@ -243,7 +243,7 @@
- child = newnode.children
- while child:
- result += child.serialize('utf-8')
-- child = child.__next__
-+ child = child.next
- tree.freeDoc()
- return result
-
-@@ -262,7 +262,7 @@
- result += child.content.decode('utf-8')
- else:
- result += self.myAttributeSerialize(child)
-- child = child.__next__
-+ child = child.next
- else:
- result = node.serialize('utf-8')
- return result
-@@ -346,13 +346,13 @@
- if newelem and newelem.children:
- free = node.children
- while free:
-- next = free.__next__
-+ next = free.next
- free.unlinkNode()
- free = next
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.__next__
-+ next = node.next
- node.replaceNode(newelem.copyNodeList())
- node.next = next
-
-@@ -378,7 +378,7 @@
- if child.type in ['text'] and child.content.strip()!='':
- final = True
- break
-- child = child.__next__
-+ child = child.next
-
- node.__autofinal__ = final
- return final
-@@ -457,7 +457,7 @@
- outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
- else:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
-
- if self.app.operation == 'merge':
- norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
-@@ -534,7 +534,7 @@
- outtxt = ''
- while child:
- outtxt += self.doSerialize(child)
-- child = child.__next__
-+ child = child.next
- return outtxt
-
- def xml_error_handler(arg, ctxt):
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:39:57.733974912 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:40:24.761946962 -0500
-@@ -326,7 +326,7 @@
- pass
-
- content = '<%s>%s</%s>' % (starttag, text, endtag)
-- tmp = tmp + content.encode('utf-8')
-+ tmp = tmp + content
-
- newnode = None
- try:
-@@ -663,7 +663,7 @@
- if not text or text.strip() == '':
- return text
- if self.gt:
-- res = self.gt.ugettext(text.decode('utf-8'))
-+ res = self.gt.gettext(text)
- return res
-
- return text
---- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig 2019-09-10 09:41:23.853885851 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py 2019-09-10 09:44:23.580699979 -0500
-@@ -352,9 +352,10 @@
-
- if node:
- copy = newelem.copyNodeList()
-- next = node.next
-+ #next = node.next
- node.replaceNode(newelem.copyNodeList())
-- node.next = next
-+ #print(type(next))
-+ #node.next = next
-
- else:
- # In practice, this happens with tags such as "<para> </para>" (only whitespace in between)
-@@ -470,7 +471,7 @@
-
- worth = self.worthOutputting(node)
- if not translation:
-- translation = outtxt.decode('utf-8')
-+ translation = outtxt
- if worth and self.app.options.get('mark_untranslated'):
- node.setLang('C')
-
---- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig 2019-09-10 09:46:15.409584334 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py 2019-09-10 09:46:30.164569075 -0500
-@@ -184,7 +184,7 @@
- else:
- ai.addChild(copy)
- if match.group(3):
-- copy.newChild(None, "year", match.group(3).encode('utf-8'))
-+ copy.newChild(None, "year", match.group(3))
- if match.group(1) and match.group(2):
- holder = match.group(1)+"(%s)" % match.group(2)
- elif match.group(1):
-@@ -193,7 +193,7 @@
- holder = match.group(2)
- else:
- holder = "???"
-- copy.newChild(None, "holder", holder.encode('utf-8'))
-+ copy.newChild(None, "holder", holder)
-
- # Perform some tests when ran standalone
- if __name__ == '__main__':
---- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~ 2019-09-10 09:50:34.000000000 -0500
-+++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in 2019-09-10 09:50:45.114305443 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -u
-+#!/usr/bin/python3 -u
- # -*- encoding: utf-8 -*-
- # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
- # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
deleted file mode 100644
index f63c6106f6c1..000000000000
--- a/srcpkgs/gnome-doc-utils/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gnome-doc-utils'
-pkgname=gnome-doc-utils
-version=0.20.10
-revision=9
-build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
-hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
- gsettings-desktop-schemas"
-makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
- libxml2-python3 libxslt"
-depends="libxslt docbook-xml docbook-xsl rarian python3 libxml2-python3"
-short_desc="Documentation utilities for GNOME"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
-distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
-checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ef53eba7a92e..2b16ae44131f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
gespeaker<=0.8.6_3
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
+ gnome-doc-utils<=0.20.10_9
gnome-getting-started-docs<=3.38.1_1
gnome-shell-mousewheel-zoom<=0.8.0_2
gnome-twitch<=0.4.2_1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-doc-utils: remove
2021-11-26 6:06 [PR PATCH] gnome-doc-utils: remove sgn
` (2 preceding siblings ...)
2021-12-01 9:58 ` [PR PATCH] [Updated] " sgn
@ 2021-12-01 10:12 ` sgn
3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-12-01 10:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]
There's a merged pull request on the void-packages repository
gnome-doc-utils: remove
https://github.com/void-linux/void-packages/pull/34248
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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] 5+ messages in thread
end of thread, other threads:[~2021-12-01 10:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-26 6:06 [PR PATCH] gnome-doc-utils: remove sgn
2021-11-26 7:56 ` [PR PATCH] [Updated] " sgn
2021-11-26 11:25 ` sgn
2021-12-01 9:58 ` [PR PATCH] [Updated] " sgn
2021-12-01 10:12 ` [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).