FreeBSD Bugzilla – Attachment 194664 Details for
Bug 220597
deskutils/gucharmap: does not compile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff-full-gucharmap
svn-diff-gucharmap (text/plain), 14.12 KB, created by
Walter Schwarzenfeld
on 2018-06-27 04:24:09 UTC
(
hide
)
Description:
svn-diff-full-gucharmap
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2018-06-27 04:24:09 UTC
Size:
14.12 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 473314) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= gucharmap >-PORTVERSION= 9.0.4 >+PORTVERSION= 10.0.4 > CATEGORIES= deskutils gnome > MASTER_SITES= GNOME > DIST_SUBDIR= gnome3 >@@ -13,14 +13,16 @@ > LICENSE= GPLv3+ > LICENSE_FILE= ${WRKSRC}/COPYING > >+LIB_DEPENDS+= libfreetype.so:print/freetype2 >+ > BUILD_DEPENDS= itstool:textproc/itstool \ > UCD>=0:textproc/UCD > > PORTSCOUT= limitw:1,even > >-USES= desktop-file-utils gmake gnome libtool localbase \ >+USES= desktop-file-utils gettext gmake gnome libtool localbase \ > pathfix pkgconfig tar:xz >-USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build >+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool intlhack introspection:build > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --with-unicode-data=${LOCALBASE}/share/unicode/ucd/ > USE_LDCONFIG= yes >@@ -29,10 +31,16 @@ > GLIB_SCHEMAS= org.gnome.Charmap.enums.xml \ > org.gnome.Charmap.gschema.xml > >-OPTIONS_SUB= yes >-OPTIONS_DEFINE= NLS >+#OPTIONS_SUB= yes >+#OPTIONS_DEFINE= NLS > >-NLS_USES= gettext >-NLS_CONFIGURE_ENABLE= nls >+#NLS_USES= gettext-tools >+#NLS_CONFIGURE_ENABLE= nls >+#NLS_CONFIGURE_OFF= --disable-nls > >+post-configure: >+ ${ECHO} "ACLOCAL = aclocal-1.16.1" >> ${WRKSRC}/Makefile.in >+ ${ECHO} "AUTOMAKE = automake-1.16.1" >> ${WRKSRC}/Makefile.in >+ ${ECHO} "ACLOCAL = aclocal-1.16.1" >> ${WRKSRC}/Makefile.am >+ ${ECHO} "AUTOMAKE = automake-1.16.1" >> ${WRKSRC}/Makefile.am > .include <bsd.port.mk> >Index: distinfo >=================================================================== >--- distinfo (revision 473314) >+++ distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1496229245 >-SHA256 (gnome3/gucharmap-9.0.4.tar.xz) = 1588b2b183b843b24eb074fd0661bddb54f18876870ba475d65f35b7a9c677a0 >-SIZE (gnome3/gucharmap-9.0.4.tar.xz) = 1029684 >+TIMESTAMP = 1529870326 >+SHA256 (gnome3/gucharmap-10.0.4.tar.xz) = bb266899266b2f2dcdbaf9f45cafd74c6f4e540132d3f0b068d37343291df001 >+SIZE (gnome3/gucharmap-10.0.4.tar.xz) = 1729220 >Index: files/patch-aclocal.m4 >=================================================================== >--- files/patch-aclocal.m4 (nonexistent) >+++ files/patch-aclocal.m4 (working copy) >@@ -0,0 +1,24 @@ >+--- aclocal.m4.orig 2018-06-27 03:58:16 UTC >++++ aclocal.m4 >+@@ -1480,10 +1480,10 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST >+ # generated from the m4 files accompanying Automake X.Y. >+ # (This private macro should not be called outside this file.) >+ AC_DEFUN([AM_AUTOMAKE_VERSION], >+-[am__api_version='1.15' >++[am__api_version='1.16.1' >+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to >+ dnl require some minimum version. Point them to the right macro. >+-m4_if([$1], [1.15], [], >++m4_if([$1], [1.16.1], [], >+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl >+ ]) >+ >+@@ -1499,7 +1499,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) >+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. >+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. >+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], >+-[AM_AUTOMAKE_VERSION([1.15])dnl >++[AM_AUTOMAKE_VERSION([1.16.1])dnl >+ m4_ifndef([AC_AUTOCONF_VERSION], >+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl >+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) > >Property changes on: files/patch-aclocal.m4 >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-configure >=================================================================== >--- files/patch-configure (nonexistent) >+++ files/patch-configure (working copy) >@@ -0,0 +1,11 @@ >+--- configure.orig 2018-06-27 03:50:35 UTC >++++ configure >+@@ -2429,7 +2429,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu >+ ac_config_headers="$ac_config_headers config.h" >+ >+ >+-am__api_version='1.15' >++am__api_version='1.16' >+ >+ ac_aux_dir= >+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do > >Property changes on: files/patch-configure >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-gucharmap-window.c >=================================================================== >--- files/patch-gucharmap-window.c (nonexistent) >+++ files/patch-gucharmap-window.c (working copy) >@@ -0,0 +1,16 @@ >+--- gucharmap/gucharmap-window.c.orig 2018-06-27 03:40:55 UTC >++++ gucharmap/gucharmap-window.c >+@@ -454,10 +454,10 @@ help_about (GSimpleAction *action, >+ gtk_show_about_dialog (GTK_WINDOW (guw), >+ "program-name", _("GNOME Character Map"), >+ "version", VERSION, >+- "comments", _("Based on the Unicode Character Database 10.0.0"), >++ "comments", _("Based on the Unicode Character Database 11.0.0"), >+ "copyright", "Copyright © 2004 Noah Levitt\n" >+- "Copyright © 1991â2017 Unicode, Inc.\n" >+- "Copyright © 2007â2017 Christian Persch\n" >++ "Copyright © 1991â2018 Unicode, Inc.\n" >++ "Copyright © 2007â2018 Christian Persch\n" >+ "Copyright © 2016 DaeHyun Sung", >+ "documenters", documenters, >+ "license", license_trans, > >Property changes on: files/patch-gucharmap-window.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-gucharmap__Makefile.am >=================================================================== >--- files/patch-gucharmap__Makefile.am (nonexistent) >+++ files/patch-gucharmap__Makefile.am (working copy) >@@ -0,0 +1,11 @@ >+--- gucharmap/Makefile.am.orig 2018-06-27 03:29:16 UTC >++++ gucharmap/Makefile.am >+@@ -204,7 +204,7 @@ gucharmap-type-builtins.c: gucharmap-typ >+ >+ WGETFLAGS = --timestamping --timeout=300 --tries=8 --no-directories --directory-prefix="$(builddir)" >+ >+-unicode_version = 10.0.0 >++unicode_version = 11.0.0 >+ >+ unicode_files = \ >+ Blocks.txt \ > >Property changes on: files/patch-gucharmap__Makefile.am >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-gucharmap__unicode-i18n.h >=================================================================== >--- files/patch-gucharmap__unicode-i18n.h (nonexistent) >+++ files/patch-gucharmap__unicode-i18n.h (working copy) >@@ -0,0 +1,54 @@ >+--- gucharmap/unicode-i18n.h.orig 2018-06-27 03:44:00 UTC >++++ gucharmap/unicode-i18n.h >+@@ -325,6 +325,7 @@ N_("Cypriot") >+ N_("Cyrillic") >+ N_("Deseret") >+ N_("Devanagari") >++N_("Dogra") >+ N_("Duployan") >+ N_("Egyptian Hieroglyphs") >+ N_("Elbasan") >+@@ -335,10 +336,13 @@ N_("Gothic") >+ N_("Grantha") >+ N_("Greek") >+ N_("Gujarati") >++N_("Gunjala Gondi") >+ N_("Gurmukhi") >+ N_("Han") >+ N_("Hangul") >++N_("Hanifi Rohingya") >+ N_("Hanunoo") >++N_("Hanifi Rohingya") >+ N_("Hatran") >+ N_("Hebrew") >+ N_("Hiragana") >+@@ -365,11 +369,13 @@ N_("Lisu") >+ N_("Lycian") >+ N_("Lydian") >+ N_("Mahajani") >++N_("Makasar") >+ N_("Malayalam") >+ N_("Mandaic") >+ N_("Manichaean") >+ N_("Marchen") >+ N_("Masaram Gondi") >++N_("Medefaidrin") >+ N_("Meetei Mayek") >+ N_("Mende Kikakui") >+ N_("Meroitic Cursive") >+@@ -392,6 +398,7 @@ N_("Old Italic") >+ N_("Old North Arabian") >+ N_("Old Permic") >+ N_("Old Persian") >++N_("Old Sogdian") >+ N_("Old South Arabian") >+ N_("Old Turkic") >+ N_("Oriya") >+@@ -412,6 +419,7 @@ N_("Shavian") >+ N_("Siddham") >+ N_("Signwriting") >+ N_("Sinhala") >++N_("Sogdian") >+ N_("Sora Sompeng") >+ N_("Soyombo") >+ N_("Sundanese") > >Property changes on: files/patch-gucharmap__unicode-i18n.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:keywords >## -0,0 +1 ## >+Author Date Id Rev URL >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-gucharmap__unicode__info.c >=================================================================== >--- files/patch-gucharmap__unicode__info.c (nonexistent) >+++ files/patch-gucharmap__unicode__info.c (working copy) >@@ -0,0 +1,20 @@ >+--- gucharmap/gucharmap-unicode-info.c.orig 2018-06-27 03:31:24 UTC >++++ gucharmap/gucharmap-unicode-info.c >+@@ -66,7 +66,7 @@ gucharmap_get_unicode_name (gunichar wc) >+ _gucharmap_intl_ensure_initialized (); >+ >+ if ((wc >= 0x3400 && wc <= 0x4db5) >+- || (wc >= 0x4e00 && wc <= 0x9fea) >++ || (wc >= 0x4e00 && wc <= 0x9fef) >+ || (wc >= 0x20000 && wc <= 0x2a6d6) >+ || (wc >= 0x2a700 && wc <= 0x2b734) >+ || (wc >= 0x2b740 && wc <= 0x2b81d) >+@@ -81,7 +81,7 @@ gucharmap_get_unicode_name (gunichar wc) >+ g_snprintf (buf, sizeof (buf), "CJK COMPATIBILITY IDEOGRAPH-%04X", wc); >+ return buf; >+ } >+- else if (wc >= 0x17000 && wc <= 0x187ec) { >++ else if (wc >= 0x17000 && wc <= 0x187f1) { >+ g_snprintf (buf, sizeof (buf), "TANGUT IDEOGRAPH-%05X", wc); >+ return buf; >+ } > >Property changes on: files/patch-gucharmap__unicode__info.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-gucharmap__unicode__info.h >=================================================================== >--- files/patch-gucharmap__unicode__info.h (nonexistent) >+++ files/patch-gucharmap__unicode__info.h (working copy) >@@ -0,0 +1,12 @@ >+--- gucharmap/gucharmap-unicode-info.h.orig 2018-06-27 03:36:38 UTC >++++ gucharmap/gucharmap-unicode-info.h >+@@ -49,7 +49,8 @@ typedef enum { >+ GUCHARMAP_UNICODE_VERSION_8_0, >+ GUCHARMAP_UNICODE_VERSION_9_0, >+ GUCHARMAP_UNICODE_VERSION_10_0, >+- GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_10_0 /* private, will move forward with each revision */ >++ GUCHARMAP_UNICODE_VERSION_11_0, >++ GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_11_0 /* private, will move forward with each revision */ >+ } GucharmapUnicodeVersion; >+ >+ /* return values are read-only */ > >Property changes on: files/patch-gucharmap__unicode__info.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:keywords >## -0,0 +1 ## >+Author Date Id Rev URL >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 473314) >+++ pkg-plist (working copy) >@@ -20,34 +20,48 @@ > libdata/pkgconfig/gucharmap-2.90.pc > share/applications/gucharmap.desktop > share/gir-1.0/Gucharmap-2.90.gir >+share/help/C/gucharmap/figures/gucharmap_window.png > share/help/C/gucharmap/index.docbook > share/help/C/gucharmap/legal.xml >+share/help/bg/gucharmap/figures/gucharmap_window.png > share/help/bg/gucharmap/index.docbook > share/help/bg/gucharmap/legal.xml > share/help/ca/gucharmap/index.docbook > share/help/ca/gucharmap/legal.xml >+share/help/cs/gucharmap/figures/gucharmap_window.png > share/help/cs/gucharmap/index.docbook > share/help/cs/gucharmap/legal.xml >+share/help/de/gucharmap/figures/gucharmap_window.png > share/help/de/gucharmap/index.docbook > share/help/de/gucharmap/legal.xml >+share/help/el/gucharmap/figures/gucharmap_window.png > share/help/el/gucharmap/index.docbook > share/help/el/gucharmap/legal.xml > share/help/en_GB/gucharmap/index.docbook > share/help/en_GB/gucharmap/legal.xml >+share/help/es/gucharmap/figures/gucharmap_window.png > share/help/es/gucharmap/index.docbook > share/help/es/gucharmap/legal.xml >+share/help/fi/gucharmap/figures/gucharmap_window.png > share/help/fi/gucharmap/index.docbook > share/help/fi/gucharmap/legal.xml >+share/help/fr/gucharmap/figures/gucharmap_window.png > share/help/fr/gucharmap/index.docbook > share/help/fr/gucharmap/legal.xml > share/help/gl/gucharmap/index.docbook > share/help/gl/gucharmap/legal.xml >+share/help/hu/gucharmap/figures/gucharmap_window.png > share/help/hu/gucharmap/index.docbook > share/help/hu/gucharmap/legal.xml >+share/help/ko/gucharmap/figures/gucharmap_window.png > share/help/ko/gucharmap/index.docbook > share/help/ko/gucharmap/legal.xml > share/help/oc/gucharmap/index.docbook > share/help/oc/gucharmap/legal.xml >+share/help/pl/gucharmap/figures/gucharmap_window.png >+share/help/pl/gucharmap/index.docbook >+share/help/pl/gucharmap/legal.xml >+share/help/pt_BR/gucharmap/figures/gucharmap_window.png > share/help/pt_BR/gucharmap/index.docbook > share/help/pt_BR/gucharmap/legal.xml > share/help/ru/gucharmap/index.docbook >@@ -54,10 +68,12 @@ > share/help/ru/gucharmap/legal.xml > share/help/sl/gucharmap/index.docbook > share/help/sl/gucharmap/legal.xml >+share/help/sv/gucharmap/figures/gucharmap_window.png > share/help/sv/gucharmap/index.docbook > share/help/sv/gucharmap/legal.xml > share/help/vi/gucharmap/index.docbook > share/help/vi/gucharmap/legal.xml >+share/help/zh_CN/gucharmap/figures/gucharmap_window.png > share/help/zh_CN/gucharmap/index.docbook > share/help/zh_CN/gucharmap/legal.xml > share/locale/af/LC_MESSAGES/gucharmap.mo >@@ -149,3 +165,10 @@ > share/locale/zh_HK/LC_MESSAGES/gucharmap.mo > share/locale/zh_TW/LC_MESSAGES/gucharmap.mo > share/metainfo/gucharmap.appdata.xml >+@dir share/help/ca/gucharmap/figures >+@dir share/help/en_GB/gucharmap/figures >+@dir share/help/gl/gucharmap/figures >+@dir share/help/oc/gucharmap/figures >+@dir share/help/ru/gucharmap/figures >+@dir share/help/sl/gucharmap/figures >+@dir share/help/vi/gucharmap/figures
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 220597
:
184225
|
191187
|
194549
|
194569
|
194613
|
194614
|
194615
|
194624
|
194625
|
194630
|
194631
|
194642
|
194664
|
194665
|
194685
|
194686
|
194691