Control: tags -1 patch pending Hi Roland,
Since this bug is rather annoying and has contributed to the calligra FTBFS situation, I intend to NMU it. I have uploaded the attached NMU to DELAYED/5, based on Peter Green's patch. Please tell me if you want me to cancel it. Thanks, James
diff -Nru pstoedit-3.70/debian/changelog pstoedit-3.70/debian/changelog --- pstoedit-3.70/debian/changelog 2016-01-22 12:50:20.000000000 +0000 +++ pstoedit-3.70/debian/changelog 2016-05-09 22:32:43.000000000 +0100 @@ -1,3 +1,13 @@ +pstoedit (3.70-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Peter Michael Green ] + * Disable broken if-check in plugin load code so that plugins can be + successfully loaded from PSTOEDITLIBDIR. (Closes: #813316) + + -- James Cowgill <[email protected]> Mon, 09 May 2016 22:31:45 +0100 + pstoedit (3.70-1) unstable; urgency=medium * New upstream release diff -Nru pstoedit-3.70/debian/patches/05-fix-plugin-loading.patch pstoedit-3.70/debian/patches/05-fix-plugin-loading.patch --- pstoedit-3.70/debian/patches/05-fix-plugin-loading.patch 1970-01-01 01:00:00.000000000 +0100 +++ pstoedit-3.70/debian/patches/05-fix-plugin-loading.patch 2016-04-23 15:09:25.000000000 +0100 @@ -0,0 +1,22 @@ +Description: Disable broken if-check in plugin load code so that plugins can be successfully loaded from PSTOEDITLIBDIR. + The plugin load code was checking pluginsloaded before trying to load plugins from PSTOEDITLIBDIR + Unfortunately code further up in the method sets pluginsloaded even if no plugins were found in + previous places. This patch restores the old 3.62 behaviour of not checking pluginsloaded before + searching for plugins in PSTOEDITLIBDIR. +Bug-Debian: http://bugs.debian.org/813316 +--- a/src/pstoedit.cpp ++++ b/src/pstoedit.cpp +@@ -282,11 +282,11 @@ static void loadpstoeditplugins(const ch + } + + #ifdef PSTOEDITLIBDIR +- if (!pluginsloaded) { ++ //if (!pluginsloaded) { + // also try to load drivers from the PSTOEDITLIBDIR + loadPlugInDrivers(PSTOEDITLIBDIR, errstream,verbose); + pluginsloaded = true; +- } ++ //} + #endif + + // delete[]plugindir; diff -Nru pstoedit-3.70/debian/patches/series pstoedit-3.70/debian/patches/series --- pstoedit-3.70/debian/patches/series 2016-01-22 15:03:54.000000000 +0000 +++ pstoedit-3.70/debian/patches/series 2016-04-23 15:08:44.000000000 +0100 @@ -2,3 +2,4 @@ 02-errors-to-stderr.patch 03-doc-remove-nonfree-options.patch 04-fix-obsolete-LIBPNG_LDFLAGS.patch +05-fix-plugin-loading.patch
signature.asc
Description: This is a digitally signed message part
