Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2019-09-23 12:38:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiphos" Mon Sep 23 12:38:58 2019 rev:20 rq:732333 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2018-08-24 17:11:41.558612700 +0200 +++ /work/SRC/openSUSE:Factory/.xiphos.new.7948/xiphos.changes 2019-09-23 12:39:30.789589274 +0200 @@ -1,0 +2,11 @@ +Wed Sep 11 10:14:48 UTC 2019 - Bjørn Lie <[email protected]> + +- Add conditional variant of suse_update_desktop_file for Factory + and newer versions of openSUSE, fixes build in Factory. +- Add conditional xiphos-build-without-scrollkeeper.patch and + xiphos-remove-gconf-2.0.patch, make scrollkeeper and + pkgconfig(gconf-2.0) BuildRequires conditional. No longer depend + on scrollkeeper and gconf in Factory and newer versions of + openSUSE. Patches borrowed from debian. + +------------------------------------------------------------------- New: ---- xiphos-build-without-scrollkeeper.patch xiphos-remove-gconf-2.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.rjW51h/_old 2019-09-23 12:39:31.589589142 +0200 +++ /var/tmp/diff_new_pack.rjW51h/_new 2019-09-23 12:39:31.593589141 +0200 @@ -25,17 +25,17 @@ Url: http://xiphos.org/ Source0: https://github.com/crosswire/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: xiphos-build-without-scrollkeeper.patch +Patch1: xiphos-remove-gconf-2.0.patch BuildRequires: docbook-utils-minimal BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: pkgconfig -BuildRequires: scrollkeeper BuildRequires: update-desktop-files BuildRequires: pkgconfig(biblesync) >= 1.1.2 BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -53,6 +53,10 @@ Provides: sword-frontend Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} < 1550 +BuildRequires: scrollkeeper +BuildRequires: pkgconfig(gconf-2.0) +%endif %description Bible Study Software for the Linux community. Lookup and search Bible texts and @@ -66,6 +70,9 @@ %prep %setup -q +%if 0%{?suse_version} >= 1550 +%autopatch -p1 +%endif %build export CFLAGS="%{optflags}" @@ -78,8 +85,12 @@ %install ./waf install --destdir=%{buildroot} +%if 0%{?suse_version} < 1550 install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop +%else +%suse_update_desktop_file %{name} Education Spirituality +%endif # package docs with macro rm -frv %{buildroot}/%{_datadir}/doc/%{name} install -Dm644 xiphos.1 %{buildroot}%{_mandir}/man1/xiphos.1 @@ -87,11 +98,13 @@ %fdupes -s %{buildroot}/%{_datadir} %find_lang %{name} +%if 0%{?suse_version} < 1330 %post %icon_theme_cache_post %postun %icon_theme_cache_postun +%endif %files %defattr(-,root,root) @@ -104,7 +117,9 @@ %dir %{_datadir}/appdata %{_datadir}/appdata/xiphos.appdata.xml %{_mandir}/man1/* +%if 0%{?suse_version} < 1550 %dir %{_datadir}/omf +%endif %files lang -f %{name}.lang %defattr(-, root, root) ++++++ xiphos-build-without-scrollkeeper.patch ++++++ From: Jeremy Bicha <[email protected]> Date: Mon, 22 Oct 2018 08:42:57 -0400 Subject: build without scrollkeeper --- help/Guidelines | 2 +- help/xiphos.omf.in | 9 --------- waffles/gnome.py | 36 ------------------------------------ wscript | 1 - 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 help/xiphos.omf.in diff --git a/help/Guidelines b/help/Guidelines index 6676912..69ec156 100644 --- a/help/Guidelines +++ b/help/Guidelines @@ -21,7 +21,7 @@ in PDF format, please email one of the Documentation developers. Also, using xmllint can save a lot of frustration: "xmllint xiphos.xml" This also helps with finding errors and debugging. -3. Please make sure that you have properly edited xiphos-manual-(lang).omf and Makefile.am. +3. Please make sure that you have properly edited Makefile.am. ----------------- Translations ----------------- diff --git a/help/xiphos.omf.in b/help/xiphos.omf.in deleted file mode 100644 index e796583..0000000 --- a/help/xiphos.omf.in +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<omf> - <resource> - <subject category="GNOME|Applications"/> - <type>manual</type> - <relation seriesid="3376140e-2a26-11d8-9eab-83cf5b4f5f4e"/> - <rights type="GNU FDL" license.version="1.1" holder="Pierre Benz"/> - </resource> -</omf> diff --git a/waffles/gnome.py b/waffles/gnome.py index 58bbb0d..b5c2290 100644 --- a/waffles/gnome.py +++ b/waffles/gnome.py @@ -37,19 +37,9 @@ def postinstall_icons(): Utils.pprint('YELLOW', 'Icon cache not updated. After install, run this:') Utils.pprint('YELLOW', 'gtk-update-icon-cache -q -f -t %s' % dir) -def postinstall_scrollkeeper(prog_name): - if Build.bld.is_install: - # now the scrollkeeper update if we can write to the log file - if os.access('/var/log/scrollkeeper.log', os.W_OK): - dir1 = Build.bld.get_install_path('${PREFIX}/var/scrollkeeper') - dir2 = Build.bld.get_install_path('${DATAROOTDIR}/omf/%s' % prog_name) - command = 'scrollkeeper-update -q -p %s -o %s' % (dir1, dir2) - ret = Utils.exec_command(command) - def postinstall(prog_name='myapp', schemas=1, icons=1, scrollkeeper=1): if schemas: postinstall_schemas(prog_name) if icons: postinstall_icons() - if scrollkeeper: postinstall_scrollkeeper(prog_name) # OBSOLETE class gnome_doc_taskgen(TaskGen.task_gen): @@ -79,17 +69,8 @@ def apply_gnome_doc(self): else: out = self.path.find_resource('%s/%s.xml' % (x, self.doc_module)) - tsk2 = self.create_task('xsltproc2po') - out2 = self.path.find_or_declare('%s/%s-%s.omf' % (x, self.doc_module, x)) - tsk2.set_outputs(out2) - node = self.path.find_resource(self.doc_module+".omf.in") - tsk2.inputs = [node, out] - - tsk2.run_after.append(tsk) - if bld.is_install: path = self.install_path + '/gnome/help/%s/%s' % (self.doc_module, x) - bld.install_files(self.install_path + '/omf/%s/' % (self.doc_module), out2, env=self.env) for y in self.to_list(self.doc_figures): try: os.stat(self.path.abspath() + '/' + x + '/' + y) @@ -187,21 +168,6 @@ Task.simple_task_type('xmlto', '${XMLTO} html -m ${SRC[1].abspath(env)} ${SRC[0] Task.simple_task_type('xml2po', '${XML2PO} ${XML2POFLAGS} ${SRC} > ${TGT}', color='BLUE') -# how do you expect someone to understand this?! -xslt_magic = """${XSLTPROC2PO} -o ${TGT[0].abspath(env)} \ ---stringparam db2omf.basename ${APPNAME} \ ---stringparam db2omf.format docbook \ ---stringparam db2omf.lang ${TGT[0].abspath(env)[:-4].split('-')[-1]} \ ---stringparam db2omf.dtd '-//OASIS//DTD DocBook XML V4.1.2//EN' \ ---stringparam db2omf.omf_dir ${PREFIX}/share/omf \ ---stringparam db2omf.help_dir ${PREFIX}/share/gnome/help \ ---stringparam db2omf.omf_in ${SRC[0].abspath(env)} \ ---stringparam db2omf.scrollkeeper_cl ${SCROLLKEEPER_DATADIR}/Templates/C/scrollkeeper_cl.xml \ -${DB2OMF} ${SRC[1].abspath(env)}""" - -#--stringparam db2omf.dtd '-//OASIS//DTD DocBook XML V4.3//EN' \ -Task.simple_task_type('xsltproc2po', xslt_magic, color='BLUE') - def detect(conf): conf.check_tool('gnu_dirs glib2 dbus') sgml2man = conf.find_program('docbook2man', var='SGML2MAN') @@ -215,8 +181,6 @@ def detect(conf): xml2po = conf.find_program('xml2po', var='XML2PO') xsltproc2po = conf.find_program('xsltproc', var='XSLTPROC2PO') conf.env['XML2POFLAGS'] = '-e -p' - conf.env['SCROLLKEEPER_DATADIR'] = Utils.cmd_output("scrollkeeper-config --pkgdatadir", silent=1).strip() - conf.env['DB2OMF'] = Utils.cmd_output("pkg-config --variable db2omf gnome-doc-utils", silent=1).strip() def set_options(opt): opt.add_option('--want-rpath', type='int', default=1, dest='want_rpath', help='set rpath to 1 or 0 [Default 1]') diff --git a/wscript b/wscript index ce5592a..9db93a8 100644 --- a/wscript +++ b/wscript @@ -533,7 +533,6 @@ def build(bld): def post(ctx): if bld.env['POST_INSTALL']: - gnome.postinstall_scrollkeeper('xiphos') # Installing the user docs gnome.postinstall_icons() # Updating the icon cache bld.add_post_fun(post) ++++++ xiphos-remove-gconf-2.0.patch ++++++ From: Teus Benschop <[email protected]> Date: Sat, 17 Nov 2018 16:33:47 +0100 Subject: remove gconf-2.0 from wscript --- wscript | 1 - 1 file changed, 1 deletion(-) diff --git a/wscript b/wscript index 0254af3..32687d2 100644 --- a/wscript +++ b/wscript @@ -303,7 +303,6 @@ def configure(conf): common_libs = string.join( ''' - "gconf-2.0" "gmodule-2.0" "glib-2.0" "libgsf-1 >= 1.14" From: Teus Benschop <[email protected]> Date: Sat, 17 Nov 2018 16:38:45 +0100 Subject: remove gconf-2.0 from source --- src/gnome2/gui.c | 66 -------------------------------------------------------- src/gui/gui.h | 7 ------ 2 files changed, 73 deletions(-) diff --git a/src/gnome2/gui.c b/src/gnome2/gui.c index 5fc4ca3..23fb120 100644 --- a/src/gnome2/gui.c +++ b/src/gnome2/gui.c @@ -68,9 +68,6 @@ void gui_init(int argc, char *argv[]) if (!gtk_init_with_args(&argc, &argv, NULL, NULL, NULL, NULL)) { exit(1); }; -#ifndef WIN32 - gconf_setup(); -#endif #ifdef HAVE_DBUS ipc = ipc_init_dbus_connection(ipc); #endif @@ -81,69 +78,6 @@ void gui_main(void) gtk_main(); } -/****************************************************************************** - * Name - * gconf_setup - * - * Synopsis - * #include "main/settings.h" - * - * void gconf_setup() - * - * Description - * verifies and initializes the GConf subsystem, so that "sword://" and - * similar can be handled by url-comprehending programs such as browsers. - * dialogs for permission/success/failure => conditional on debug build. - * - * Return value - * void - */ - -/* NOTE: removed query for user permission to install handlers around -r4528. */ -/* we don't ask any more, because there's no good reason not to take over. */ - -char *gconf_keys[GS_GCONF_MAX][2] = { - {"/desktop/gnome/url-handlers/bible/command", "xiphos-nav \"%s\""}, - {"/desktop/gnome/url-handlers/bible/enabled", (char *)1}, - {"/desktop/gnome/url-handlers/bible/needs_terminal", (char *)0}, - {"/desktop/gnome/url-handlers/sword/command", "xiphos-nav \"%s\""}, - {"/desktop/gnome/url-handlers/sword/enabled", (char *)1}, - {"/desktop/gnome/url-handlers/sword/needs_terminal", (char *)0}}; - -#ifndef WIN32 -void gconf_setup() -{ - gchar *str; - GConfClient *client = gconf_client_get_default(); - - if (client == NULL) - return; /* we're not running under GConf */ - - /* - * This is deliberately somewhat simple-minded, at least for now. - * We care about one thing: Is anything set to handle "bible://"? - * - * Unfortunate consequence of changing xiphos2 => xiphos: - * We must fix broken keys. - */ - if ((((str = gconf_client_get_string(client, gconf_keys[0][0], - NULL)) == NULL) || - (strncmp(str, "xiphos ", 7) == 0))) { - /* - * Mechanical as can be, one after another. - */ - int i; - for (i = 0; i < GS_GCONF_MAX; ++i) { - (((i % 3) == 0) /* contrived hack */ - ? gconf_client_set_string(client, gconf_keys[i][0], gconf_keys[i][1], NULL) - : gconf_client_set_bool(client, - gconf_keys[i][0], - (gconf_keys[i][1] ? TRUE : FALSE), NULL)); - } - } -} -#endif /* WIN32 */ - #ifdef DEBUG /* NOTE: these routines are here only and exactly because there is no other */ diff --git a/src/gui/gui.h b/src/gui/gui.h index a6628e6..202e7ca 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -4,13 +4,6 @@ void gui_init(int argc, char *argv[]); void gui_main(void); -#ifndef WIN32 -#include <gconf/gconf-client.h> -void gconf_setup(void); -#endif - -#define GS_GCONF_MAX 6 - #ifdef DEBUG gchar *XI_g_strdup_printf(const char *filename,
