commit 8174c4896cca8b1b10fd482049a8647c844142e0 Author: Tim Biermann <tbier@posteo.de> Date: Fri Jun 30 15:12:21 2023 +0200 fontforge: adopted; fixed build diff --git a/fontforge/.signature b/fontforge/.signature index c00df7519..786675fd1 100644 --- a/fontforge/.signature +++ b/fontforge/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+DBeLsGoDB8sW160pySJq8O/7TvK44y6gx+gWuiejAjzqZjUmoHnuTnrP2LJYE2dPcLA8WWZ3NstJhmuNJj5gk= -SHA256 (Pkgfile) = 79c5e4dc119e94f74425cd9a105b404ba767e1cd7ad2dba18efff1fa7cd8a505 +RWSagIOpLGJF31zbyTyris56dYp48D6aDcuWpEhXpBtSg3rOFGNh2Rx3U+X+1szdARdadV61fmqqTJVJPyhPPStZTLPooKxibwE= +SHA256 (Pkgfile) = 2377e1a056491f3d6880213e3ec50796730e7c1581bfe243db6b87107b0fe1ae SHA256 (.footprint) = 7a192f33a103fe6617af9f77f0ffb10dc0fc92d6a692adab115dc5acd9d3e047 SHA256 (fontforge-20230101.tar.xz) = ca82ec4c060c4dda70ace5478a41b5e7b95eb035fe1c4cf85c48f996d35c60f8 +SHA256 (fontforge-20230101-workaround-broken-translations.patch) = bdb18d9a9c1da2be0e73a127d18ed831cc47f153da9ceee824198de648afcfa4 diff --git a/fontforge/Pkgfile b/fontforge/Pkgfile index eb8ccdcde..274240929 100644 --- a/fontforge/Pkgfile +++ b/fontforge/Pkgfile @@ -1,36 +1,38 @@ -# Description: Outline and bitmap font editor. +# Description: Outline and bitmap font editor # URL: https://fontforge.github.io/ -# Maintainer: Danny Rawlins, monster dot romster at gmail dot com +# Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: giflib gtk3 libspiro libuninameslist libwebp potrace woff2 name=fontforge version=20230101 -release=1 -source=(https://github.com/$name/$name/releases/download/$version/$name-$version.tar...) +release=2 +source=(https://github.com/$name/$name/releases/download/$version/$name-$version.tar... + fontforge-20230101-workaround-broken-translations.patch) build() { - if [ -e '/usr/lib/ccache' ]; then - PKGMK_FONTFORGE+=' -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_C_COMPILER_LAUNCHER=ccache' - PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') - fi + if [ -e '/usr/lib/ccache' ]; then + PKGMK_FONTFORGE+=' -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_C_COMPILER_LAUNCHER=ccache' + PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') + fi - cmake -S $name-$version -B build -G Ninja $PKGMK_FONTFORGE \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ - -D ENABLE_MAINTAINER_TOOLS=TRUE \ - -D ENABLE_FONTFORGE_EXTRAS=TRUE \ - -D UNIX=TRUE \ - -D ENABLE_DOCS=FALSE \ - -Wno-dev + patch -Np1 -d $name-$version -i $SRC/fontforge-20230101-workaround-broken-translations.patch - sed -i 's|-R/usr/lib||g' build/build.ninja + cmake -S $name-$version -B build -G Ninja $PKGMK_FONTFORGE \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D ENABLE_MAINTAINER_TOOLS=TRUE \ + -D ENABLE_FONTFORGE_EXTRAS=TRUE \ + -D UNIX=TRUE \ + -D ENABLE_DOCS=FALSE \ + -Wno-dev - sed -i 's!-R/usr/lib!!g' build/build.ninja - cmake --build build - DESTDIR=$PKG cmake --install build + sed -i 's!-R/usr/lib!!g' build/build.ninja - rm -r $PKG/usr/share/locale + cmake --build build + DESTDIR=$PKG cmake --install build + + rm -r $PKG/usr/share/locale } diff --git a/fontforge/fontforge-20230101-workaround-broken-translations.patch b/fontforge/fontforge-20230101-workaround-broken-translations.patch new file mode 100644 index 000000000..e195e433b --- /dev/null +++ b/fontforge/fontforge-20230101-workaround-broken-translations.patch @@ -0,0 +1,159 @@ +https://bugs.gentoo.org/908868 +https://savannah.gnu.org/bugs/index.php?64333 +https://github.com/fontforge/fontforge/issues/5251 + +From f80f80871c6e3777f9974a44058f494eb5353c66 Mon Sep 17 00:00:00 2001 +From: blockiv <blockiv@tuta.io> +Date: Thu, 22 Jun 2023 04:39:16 +0000 +Subject: [PATCH] Mark breaking translations as fuzzy + +--- a/po/fr.po ++++ b/po/fr.po +@@ -289,7 +289,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" + #. GT: $2 is the glyph's encoding + #. GT: $3 is the font name + #. GT: $4 is the changed flag ('*' for the changed items) +-#, c-format ++#, c-format, fuzzy + msgid "%1$.80s at %2$d from %3$.90s%4$s" + msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + +@@ -300,7 +300,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + #. GT: $2 is the glyph's encoding + #. GT: $3 is the pixel size of the bitmap font + #. GT: $4 is the font name +-#, c-format ++#, c-format, fuzzy + msgid "%1$.80s at %2$d size %3$d from %4$.80s" + msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" + +@@ -7427,7 +7427,7 @@ msgstr "" + "La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" + "Voulez-vous l'enregistrer ?" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -19920,7 +19920,7 @@ msgstr "" + "Le nom de la fonte commence avec une séquence d'ordre d'octet utf8. Ceci " + "n'est pas permis. %s" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" +@@ -19928,7 +19928,7 @@ msgstr "" + "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " + "codages différents" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" +@@ -19963,7 +19963,7 @@ msgstr "" + "Le glyphe %1$.30s dans %2$.30s a à la fois des références et des contours. " + "Ceci n'est pas supporté dans une fonte MM" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" +@@ -19979,7 +19979,7 @@ msgstr "" + "Le glyphe %1$.30s de la fonte %2$.30s a un nombre de points (ou de points de " + "contrôle) différent que dans %3$.30s" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" +@@ -20454,7 +20454,7 @@ msgstr "" + "individuellement. Cela peut être utile si vous vouliez\n" + "conserver les versions quadratiques et cubiques d'une fonte." + +-#, c-format ++#, c-format, fuzzy + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" + "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" +@@ -21040,7 +21040,7 @@ msgstr "" + msgid "There is already a subtable with that name, please pick another." + msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" + +-#, c-format ++#, c-format, fuzzy + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." + +@@ -21435,7 +21435,7 @@ msgstr "" + "Cette fonte ne précise pas de 'unitsPerEm', alors nous assumons que c'est " + "1000." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -21764,7 +21764,7 @@ msgstr "" + "Et sur в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n" + "Et sur toutes les lettres grecques minuscules. Et peut être tout le reste." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " +@@ -24544,7 +24544,7 @@ msgstr "" + "Vous voulez effacer %.30s qui est référencé par un\n" + "autre glyphe. Êtes-vous sûr(e) de vouloir poursuivre ?" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font, nor can I find the original character " +@@ -24556,7 +24556,7 @@ msgstr "" + "glyphe auquel il se référait.\n" + "Le glyphe ne sera pas copié." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font.\n" +--- a/po/it.po ++++ b/po/it.po +@@ -2297,7 +2297,7 @@ msgstr "Riferimento invertito" + msgid "Flipping" + msgstr "Ribaltamento" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -5830,7 +5830,7 @@ msgstr "" + msgid "The font does not contain a glyph named %s." + msgstr "Questo font non contiene un glifo chiamato %s." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" +@@ -6229,7 +6229,7 @@ msgstr "" + msgid "This font does not specify font-face\n" + msgstr "Questo font non specifica il font-face\n" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +-- +2.41.0