Author: kelnos
Date: 2008-11-17 02:16:02 +0000 (Mon, 17 Nov 2008)
New Revision: 28835
Modified:
xfce4-dev-tools/trunk/ChangeLog
xfce4-dev-tools/trunk/scripts/xdt-autogen.in
Log:
* scripts/xdt-autogen.in: Remove intltool auto-patch: it wasn't
terribly reliable, and Xfce doesn't need it anymore anyway.
Modified: xfce4-dev-tools/trunk/ChangeLog
===================================================================
--- xfce4-dev-tools/trunk/ChangeLog 2008-11-17 02:13:14 UTC (rev 28834)
+++ xfce4-dev-tools/trunk/ChangeLog 2008-11-17 02:16:02 UTC (rev 28835)
@@ -1,3 +1,8 @@
+2008-11-16 Brian Tarricone <[EMAIL PROTECTED]>
+
+ * scripts/xdt-autogen.in: Remove intltool auto-patch: it wasn't
+ terribly reliable, and Xfce doesn't need it anymore anyway.
+
2008-11-11 Jannis Pohlmann <[EMAIL PROTECTED]>
* scripts/xdt-commit: Use !/bin/bash instead of !/bin/sh in the
Modified: xfce4-dev-tools/trunk/scripts/xdt-autogen.in
===================================================================
--- xfce4-dev-tools/trunk/scripts/xdt-autogen.in 2008-11-17 02:13:14 UTC
(rev 28834)
+++ xfce4-dev-tools/trunk/scripts/xdt-autogen.in 2008-11-17 02:16:02 UTC
(rev 28835)
@@ -58,49 +58,6 @@
##
-## This fixes a bug in intltool-merge that fails to merge translations
-## for .desktop file keys that have a '-' or '_' char in them. this
-## is fixed in intltool 0.40.4.
-##
-patch_intltool_merge() {
- verstring=`$XDT_PROG_INTLTOOLIZE --version | cut -d' ' -f4`
- ver_major=`echo $verstring | cut -d. -f1`
- ver_minor=`echo $verstring | cut -d. -f2`
- ver_micro=`echo $verstring | cut -d. -f3`
-
- if test "$ver_major" -a "$ver_minor" -a "$ver_micro"; then
- test $ver_major -gt 0 && return 0
- test $ver_minor -gt 40 && return 0
- test $ver_minor -eq 40 -a $ver_micro -ge 4 && return 0
- if test $ver_minor -eq 40 -a $ver_micro -lt 4; then
- echo "WARNING: Unable to patch intltool-merge from versions 0.40.0
through 0.40.3."
- echo "WARNING: Generated .desktop files may be invalid."
- return 0 # already printed an error; just pretend success
- fi
- fi
-
- # attempt to patch, and hope it works...
- test -z "$@" && echo 'Patching intltool-merge.in ...'
- echo '--- intltool-merge.in.orig 2008-08-24 19:02:59.000000000 -0700
-+++ intltool-merge.in 2008-08-24 19:03:12.000000000 -0700
-@@ -1182,9 +1182,9 @@
-
- while (<INPUT>)
- {
-- if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ if (s/^(\s*)_((\w|-|_)+=(.*))/$1$2/)
- {
-- my $string = $3;
-+ my $string = $4;
-
- print OUTPUT;
- ' | patch -p0 "$@" >/dev/null 2>&1
-
- return $?
-}
-
-
-##
## Determine XDG data dirs
##
test -z "${XDG_DATA_HOME}" && XDG_DATA_HOME="${HOME}/.local/share"
@@ -392,12 +349,6 @@
(echo "Running ${XDT_PROG_INTLTOOLIZE} --automake --copy --force" &&
cd "${source_dir}" &&
${XDT_PROG_INTLTOOLIZE} --automake --copy --force) || exit 1
- if patch_intltool_merge --dry-run; then
- patch_intltool_merge
- else
- echo 'WARNING: Failed to patch intltool-merge.in!'
- echo 'WARNING: Generated .desktop files may be incorrect.'
- fi
fi
# patch the po/Makefile.in.in to take into account the setting of
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
