On Mon, Dec 08, 2014 at 11:50:39PM +0100, Matthias Kilian wrote:
> The only failure is graphics/inkscape. Anyone using it and want to
> investigate? But be aware that there's already a more than insane
> #ifdef maze using POPPLER_NEW_COLOR_SPACE_API and
> POPPLER_EVEN_NEWER_COLOR_SPACE_API, so what's next?
Obviously, noone cares. So here's my best effort diff (untested,
because I'm not using it).
Update to inkscape-0.48.5 and fix for poppler-0.29.0.
Please test (if possible, with the poppler diff I sent some days
ago) and comment.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 10 Jul 2014 10:19:45 -0000 1.39
+++ Makefile 11 Dec 2014 20:48:38 -0000
@@ -2,8 +2,7 @@
COMMENT= SVG vector drawing application
-DISTNAME= inkscape-0.48.4
-REVISION = 1
+DISTNAME= inkscape-0.48.5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/inkscape/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 22 Oct 2013 00:14:59 -0000 1.8
+++ distinfo 11 Dec 2014 20:48:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (inkscape-0.48.4.tar.gz) = bhnuCHp5ASoM7JxubRlDV+JWt+xThTbvy990/fLTHVo=
-SIZE (inkscape-0.48.4.tar.gz) = 26452454
+SHA256 (inkscape-0.48.5.tar.gz) = /1GU94BXqyQjTtcbjnqiJ9SEfUIWbG1EOR76hvPK8TA=
+SIZE (inkscape-0.48.5.tar.gz) = 26301353
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/inkscape/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 10 Jul 2014 10:19:45 -0000 1.7
+++ patches/patch-configure_ac 11 Dec 2014 21:08:32 -0000
@@ -1,13 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.7 2014/07/10 10:19:45 robert Exp $
-First chunk reported to upstream and committed on trunk and the
-0.48 branch: https://bugs.launchpad.net/inkscape/+bug/1315142
-
Hardcoded -dl.
---- configure.ac.orig Sat Dec 15 17:50:19 2012
-+++ configure.ac Thu Jul 10 11:39:49 2014
-@@ -263,7 +263,7 @@ if test "x$gc_ok" = "xyes" && test "x$cross_compiling"
+--- configure.ac.orig Fri Jun 20 22:29:03 2014
++++ configure.ac Thu Dec 11 22:08:27 2014
+@@ -241,7 +241,7 @@ if test "x$gc_ok" = "xyes" && test "x$cross_compiling"
# include <gc.h>
#endif
#include <stdio.h>
@@ -16,19 +13,19 @@ Hardcoded -dl.
int main(void){
unsigned min = ((6 << 16) | (4 << 8) | 0);
printf("%d.%d.%d ",GC_version >> 16,
(GC_version >> 8) & 0xFF, GC_version & 0xFF);
-@@ -610,6 +610,11 @@ else
- AC_MSG_RESULT(no)
+@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then
+ AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color
space API from Poppler >= 0.26.0])
fi
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_COLOR_SPACE_API, poppler >= 0.26.0,
popplernewercolorspaceapi=yes, popplernewercolorspaceapi=no)
-+if test "x$popplernewercolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color
space API from Poppler >= 0.26.0])
++PKG_CHECK_MODULES(POPPLER_REALLY_NEWEWST_COLOR_SPACE_API, poppler >= 0.29.0,
popplernewestcolorspaceapi=yes, popplernewestcolorspaceapi=no)
++if test "x$popplernewestcolorspaceapi" = "xyes"; then
++ AC_DEFINE(POPPLER_REALLY_NEWEST_COLOR_SPACE_API, 1, [Use really newest
color space API from Poppler >= 0.29.0])
+fi
+
# Poppler's b604a008 commit changes this
AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
popplergfxcolor="no"
-@@ -780,7 +785,7 @@ if test "x$cairo_pdf" = "xyes"; then
+@@ -757,7 +762,7 @@ if test "x$cairo_pdf" = "xyes"; then
fi
dnl Shouldn't we test for libpng and libz?
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===================================================================
RCS file:
/cvs/ports/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp 13 Jun
2014 20:52:52 -0000 1.8
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp 11 Dec
2014 22:45:19 -0000
@@ -1,128 +1,83 @@
$OpenBSD: patch-src_extension_internal_pdfinput_pdf-parser_cpp,v 1.8
2014/06/13 20:52:52 kili Exp $
-Reported to upstream and committed on trunk and the 0.48 branch:
-https://bugs.launchpad.net/inkscape/+bug/1315142
+This patch is dedicated to Joe Zawinul for his famous tune "mercy
+mercy mercy".
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig Thu Dec 13
18:00:46 2012
-+++ src/extension/internal/pdfinput/pdf-parser.cpp Fri May 30 21:43:38 2014
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig Mon Jun 9
15:24:41 2014
++++ src/extension/internal/pdfinput/pdf-parser.cpp Thu Dec 11 22:23:37 2014
@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object args[], int numA
blendingColorSpace = NULL;
isolated = knockout = gFalse;
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj5);
-@@ -1083,8 +1085,14 @@ void PdfParser::opSetFillColorSpace(Object args[], int
+@@ -1085,8 +1087,14 @@ void PdfParser::opSetFillColorSpace(Object args[], int
state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
+ } else {
-+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
+ }
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL);
+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
} else {
- colorSpace = GfxColorSpace::parse(&obj, NULL);
-@@ -1118,8 +1126,14 @@ void PdfParser::opSetStrokeColorSpace(Object args[], i
+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
+@@ -1126,8 +1134,14 @@ void PdfParser::opSetStrokeColorSpace(Object args[], i
state->setStrokePattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
if (obj.isNull()) {
-+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
+ } else {
-+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
+ }
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL);
+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
} else {
- colorSpace = GfxColorSpace::parse(&obj, NULL);
-@@ -1211,8 +1225,14 @@ void PdfParser::opSetFillColorN(Object args[], int num
- state->setFillColor(&color);
- builder->updateStyle(state);
- }
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (args[numArgs-1].isName() &&
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-+ state->setFillPattern(pattern);
-+ builder->updateStyle(state);
-+ }
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+ if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setFillPattern(pattern);
- builder->updateStyle(state);
-@@ -1271,8 +1291,14 @@ void PdfParser::opSetStrokeColorN(Object args[], int n
- state->setStrokeColor(&color);
- builder->updateStyle(state);
- }
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- if (args[numArgs-1].isName() &&
-+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
-+ state->setStrokePattern(pattern);
-+ builder->updateStyle(state);
-+ }
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+ if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setStrokePattern(pattern);
- builder->updateStyle(state);
-@@ -1710,7 +1736,11 @@ void PdfParser::opShFill(Object args[], int numArgs) {
- double *matrix = NULL;
- GBool savedState = gFalse;
-
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
-+ return;
-+ }
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
- return;
- }
-@@ -2726,7 +2756,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
+@@ -2756,7 +2770,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
}
}
if (!obj1.isNull()) {
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
++ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
colorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
- colorSpace = GfxColorSpace::parse(&obj1);
-@@ -2815,7 +2847,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
+@@ -2847,7 +2863,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
obj2.free();
}
}
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1,
NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL,
NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
- maskColorSpace = GfxColorSpace::parse(&obj1);
-@@ -3006,7 +3040,9 @@ void PdfParser::doForm(Object *str) {
+@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) {
if (obj1.dictLookup(const_cast<char*>("S"),
&obj2)->isName(const_cast<char*>("Transparency"))) {
transpGroup = gTrue;
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-+#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
-+#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_REALLY_NEWEST_COLOR_SPACE_API)
++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj3);
Index: patches/patch-src_gc-core_h
===================================================================
RCS file: patches/patch-src_gc-core_h
diff -N patches/patch-src_gc-core_h
--- patches/patch-src_gc-core_h 10 Jul 2014 10:19:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gc-core_h,v 1.1 2014/07/10 10:19:45 robert Exp $
---- src/gc-core.h.orig Tue Feb 14 04:22:17 2012
-+++ src/gc-core.h Thu Jul 10 11:14:45 2014
-@@ -57,7 +57,7 @@ struct Ops {
- CleanupFunc *old_func,
- void **old_data);
- int (*general_register_disappearing_link)(void **p_ptr,
-- void *base);
-+ const void *base);
- int (*unregister_disappearing_link)(void **p_ptr);
- std::size_t (*get_heap_size)();
- std::size_t (*get_free_bytes)();
Index: patches/patch-src_gc_cpp
===================================================================
RCS file: patches/patch-src_gc_cpp
diff -N patches/patch-src_gc_cpp
--- patches/patch-src_gc_cpp 10 Jul 2014 10:19:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-src_gc_cpp,v 1.1 2014/07/10 10:19:45 robert Exp $
---- src/gc.cpp.orig Tue Feb 14 04:22:17 2012
-+++ src/gc.cpp Thu Jul 10 11:14:45 2014
-@@ -70,8 +70,8 @@ void *debug_base(void *ptr) {
- return base + debug_base_fixup();
- }
-
--int debug_general_register_disappearing_link(void **p_ptr, void *base) {
-- char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
-+int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
-+ char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base))
- debug_base_fixup();
- return GC_general_register_disappearing_link(p_ptr, real_base);
- }
-
-@@ -90,7 +90,7 @@ void dummy_register_finalizer(void *, CleanupFunc, voi
- }
- }
-
--int dummy_general_register_disappearing_link(void **, void *) { return false;
}
-+int dummy_general_register_disappearing_link(void **, const void *) { return
false; }
-
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
-
-@@ -112,7 +112,11 @@ Ops enabled_ops = {
- &GC_malloc_atomic_uncollectable,
- &GC_base,
- &GC_register_finalizer_ignore_self,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
- &GC_general_register_disappearing_link,
-+#else
-+ (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
- &GC_unregister_disappearing_link,
- &GC_get_heap_size,
- &GC_get_free_bytes,
-@@ -202,7 +206,7 @@ void stub_register_finalizer_ignore_self(void *, Clean
- die_because_not_initialized();
- }
-
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, const void *) {
- die_because_not_initialized();
- return 0;
- }
Index: patches/patch-src_libnrtype_FontFactory_h
===================================================================
RCS file: patches/patch-src_libnrtype_FontFactory_h
diff -N patches/patch-src_libnrtype_FontFactory_h
--- patches/patch-src_libnrtype_FontFactory_h 9 Jan 2014 22:22:19 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_libnrtype_FontFactory_h,v 1.1 2014/01/09 22:22:19 naddy
Exp $
---- src/libnrtype/FontFactory.h.orig Fri Jul 8 20:25:09 2011
-+++ src/libnrtype/FontFactory.h Thu Jan 9 22:58:34 2014
-@@ -31,7 +31,8 @@
- #include <pango/pangowin32.h>
- #else
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
-
- namespace Glib
Index: patches/patch-src_ui_dialog_print_cpp
===================================================================
RCS file: /cvs/ports/graphics/inkscape/patches/patch-src_ui_dialog_print_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ui_dialog_print_cpp
--- patches/patch-src_ui_dialog_print_cpp 5 Oct 2010 08:57:47 -0000
1.2
+++ patches/patch-src_ui_dialog_print_cpp 11 Dec 2014 20:54:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ui_dialog_print_cpp,v 1.2 2010/10/05 08:57:47 armani Exp $
---- src/ui/dialog/print.cpp.orig Wed Sep 15 20:24:17 2010
-+++ src/ui/dialog/print.cpp Wed Sep 15 20:24:39 2010
-@@ -17,6 +17,7 @@
+--- src/ui/dialog/print.cpp.orig Mon Jun 9 15:24:41 2014
++++ src/ui/dialog/print.cpp Thu Dec 11 21:49:08 2014
+@@ -18,6 +18,7 @@
#endif
#include <gtkmm/stock.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 24 Oct 2013 23:28:21 -0000 1.9
+++ pkg/PLIST 11 Dec 2014 22:40:39 -0000
@@ -16,7 +16,6 @@ share/inkscape/clipart/
share/inkscape/clipart/README
share/inkscape/clipart/draw-freely.ru.svg
share/inkscape/clipart/draw-freely.svg
-share/inkscape/clipart/inkscape.logo.svg
share/inkscape/clipart/orav.svg
share/inkscape/clipart/tux.svg
share/inkscape/examples/
@@ -792,42 +791,22 @@ share/inkscape/ui/menus-bars.xml
share/inkscape/ui/toolbox.xml
share/inkscape/ui/units.txt
share/inkscape/ui/units.xml
-share/locale/am/
-share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/inkscape.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/inkscape.mo
-share/locale/az/
-share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/inkscape.mo
share/locale/be/LC_MESSAGES/inkscape.mo
share/locale/bg/LC_MESSAGES/inkscape.mo
-share/locale/bn/
-share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/inkscape.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/inkscape.mo
share/locale/ca/LC_MESSAGES/inkscape.mo
-share/locale/ca@valencia/
-share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/inkscape.mo
share/locale/cs/LC_MESSAGES/inkscape.mo
share/locale/da/LC_MESSAGES/inkscape.mo
share/locale/de/LC_MESSAGES/inkscape.mo
-share/locale/dz/
-share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/inkscape.mo
share/locale/el/LC_MESSAGES/inkscape.mo
-share/locale/en_AU/
-share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/inkscape.mo
-share/locale/en_CA/
-share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/inkscape.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/inkscape.mo
share/locale/en_US@piglatin/
share/locale/en_US@piglatin/LC_MESSAGES/
@@ -839,8 +818,6 @@ share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/inkscape.mo
share/locale/et/LC_MESSAGES/inkscape.mo
share/locale/eu/LC_MESSAGES/inkscape.mo
-share/locale/fa/
-share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/inkscape.mo
share/locale/fi/LC_MESSAGES/inkscape.mo
share/locale/fr/LC_MESSAGES/inkscape.mo
@@ -849,28 +826,16 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
share/locale/he/LC_MESSAGES/inkscape.mo
share/locale/hr/LC_MESSAGES/inkscape.mo
share/locale/hu/LC_MESSAGES/inkscape.mo
-share/locale/hy/
-share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/inkscape.mo
share/locale/id/LC_MESSAGES/inkscape.mo
share/locale/it/LC_MESSAGES/inkscape.mo
share/locale/ja/LC_MESSAGES/inkscape.mo
-share/locale/km/
-share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/inkscape.mo
share/locale/ko/LC_MESSAGES/inkscape.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/inkscape.mo
-share/locale/mk/
-share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/inkscape.mo
-share/locale/mn/
-share/locale/mn/LC_MESSAGES/
share/locale/mn/LC_MESSAGES/inkscape.mo
share/locale/nb/LC_MESSAGES/inkscape.mo
-share/locale/ne/
-share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/inkscape.mo
share/locale/nl/LC_MESSAGES/inkscape.mo
share/locale/nn/LC_MESSAGES/inkscape.mo
@@ -880,24 +845,16 @@ share/locale/pt/LC_MESSAGES/inkscape.mo
share/locale/pt_BR/LC_MESSAGES/inkscape.mo
share/locale/ro/LC_MESSAGES/inkscape.mo
share/locale/ru/LC_MESSAGES/inkscape.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/inkscape.mo
share/locale/sk/LC_MESSAGES/inkscape.mo
share/locale/sl/LC_MESSAGES/inkscape.mo
-share/locale/sq/
-share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/inkscape.mo
share/locale/sr/LC_MESSAGES/inkscape.mo
-share/locale/sr@latin/
-share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/inkscape.mo
share/locale/sv/LC_MESSAGES/inkscape.mo
share/locale/te_IN/
share/locale/te_IN/LC_MESSAGES/
share/locale/te_IN/LC_MESSAGES/inkscape.mo
-share/locale/th/
-share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/inkscape.mo
share/locale/tr/LC_MESSAGES/inkscape.mo
share/locale/uk/LC_MESSAGES/inkscape.mo
