From 291c34d9f89d4ebd6f083b5b904555b7720b4b9f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 4 Jul 2007 11:03:30 +0000 Subject: [PATCH] openmoko-pim: sync with openmoko svn overlay --- .../.mtn2git_empty | 0 .../{openmoko-contacts => files}/index.theme | 0 .../intltool-update.in | 0 .../openmoko-pim/files/openmoko-dates.desktop | 12 + .../openmoko-pim/files/openmoko-dates.png | Bin 0 -> 12121 bytes .../stock_contact.png | Bin .../stock_person.png | Bin .../openmoko-dates/.mtn2git_empty | 0 .../openmoko-dates/compile-fix.patch | 12 - .../openmoko-dates/intltool-update.in | 1089 ----------------- .../om-dates-temp-buildfix_20070308.patch | 8 - .../openmoko-dates/remove-bogus-include.patch | 10 - packages/openmoko-pim/openmoko-dates_svn.bb | 16 +- packages/openmoko-pim/openmoko-tasks_svn.bb | 15 + packages/openmoko-pim/openmoko-today_svn.bb | 2 +- 15 files changed, 37 insertions(+), 1127 deletions(-) rename packages/openmoko-pim/{openmoko-contacts => files}/.mtn2git_empty (100%) rename packages/openmoko-pim/{openmoko-contacts => files}/index.theme (100%) rename packages/openmoko-pim/{openmoko-contacts => files}/intltool-update.in (100%) create mode 100644 packages/openmoko-pim/files/openmoko-dates.desktop create mode 100644 packages/openmoko-pim/files/openmoko-dates.png rename packages/openmoko-pim/{openmoko-contacts => files}/stock_contact.png (100%) rename packages/openmoko-pim/{openmoko-contacts => files}/stock_person.png (100%) delete mode 100644 packages/openmoko-pim/openmoko-dates/.mtn2git_empty delete mode 100644 packages/openmoko-pim/openmoko-dates/compile-fix.patch delete mode 100644 packages/openmoko-pim/openmoko-dates/intltool-update.in delete mode 100644 packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch delete mode 100644 packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch create mode 100644 packages/openmoko-pim/openmoko-tasks_svn.bb diff --git a/packages/openmoko-pim/openmoko-contacts/.mtn2git_empty b/packages/openmoko-pim/files/.mtn2git_empty similarity index 100% rename from packages/openmoko-pim/openmoko-contacts/.mtn2git_empty rename to packages/openmoko-pim/files/.mtn2git_empty diff --git a/packages/openmoko-pim/openmoko-contacts/index.theme b/packages/openmoko-pim/files/index.theme similarity index 100% rename from packages/openmoko-pim/openmoko-contacts/index.theme rename to packages/openmoko-pim/files/index.theme diff --git a/packages/openmoko-pim/openmoko-contacts/intltool-update.in b/packages/openmoko-pim/files/intltool-update.in similarity index 100% rename from packages/openmoko-pim/openmoko-contacts/intltool-update.in rename to packages/openmoko-pim/files/intltool-update.in diff --git a/packages/openmoko-pim/files/openmoko-dates.desktop b/packages/openmoko-pim/files/openmoko-dates.desktop new file mode 100644 index 0000000000..f13cadeb9a --- /dev/null +++ b/packages/openmoko-pim/files/openmoko-dates.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Dates +Comment=Dates +Exec=dates +Icon=openmoko-dates +Terminal=false +Type=Application +Categories=GTK;Application;PIM;Office +MimeType=text/x-vcard; +SingleInstance=false +StartupNotify=true diff --git a/packages/openmoko-pim/files/openmoko-dates.png b/packages/openmoko-pim/files/openmoko-dates.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe04f409605799bf10acc48f2f4ce6d379e9576 GIT binary patch literal 12121 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 literal 0 HcmV?d00001 diff --git a/packages/openmoko-pim/openmoko-contacts/stock_contact.png b/packages/openmoko-pim/files/stock_contact.png similarity index 100% rename from packages/openmoko-pim/openmoko-contacts/stock_contact.png rename to packages/openmoko-pim/files/stock_contact.png diff --git a/packages/openmoko-pim/openmoko-contacts/stock_person.png b/packages/openmoko-pim/files/stock_person.png similarity index 100% rename from packages/openmoko-pim/openmoko-contacts/stock_person.png rename to packages/openmoko-pim/files/stock_person.png diff --git a/packages/openmoko-pim/openmoko-dates/.mtn2git_empty b/packages/openmoko-pim/openmoko-dates/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-pim/openmoko-dates/compile-fix.patch b/packages/openmoko-pim/openmoko-dates/compile-fix.patch deleted file mode 100644 index 41b1f173c2..0000000000 --- a/packages/openmoko-pim/openmoko-dates/compile-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: omoko/src/dates_navigator.c -=================================================================== ---- omoko.orig/src/dates_navigator.c 2007-02-06 16:49:45.000000000 +0100 -+++ omoko/src/dates_navigator.c 2007-02-06 16:51:18.000000000 +0100 -@@ -18,7 +18,6 @@ - - #include - --#include - #include - #include - #include diff --git a/packages/openmoko-pim/openmoko-dates/intltool-update.in b/packages/openmoko-pim/openmoko-dates/intltool-update.in deleted file mode 100644 index 661d8fe6ac..0000000000 --- a/packages/openmoko-pim/openmoko-dates/intltool-update.in +++ /dev/null @@ -1,1089 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Updater -# -# Copyright (C) 2000-2003 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Maciej Stachowiak -# Darin Adler - -## Release information -my $PROGRAM = "intltool-update"; -my $VERSION = "0.35.0"; -my $PACKAGE = "intltool"; - -## Loaded modules -use strict; -use Getopt::Long; -use Cwd; -use File::Copy; -use File::Find; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $DIST_ARG = 0; -my $POT_ARG = 0; -my $HEADERS_ARG = 0; -my $MAINTAIN_ARG = 0; -my $REPORT_ARG = 0; -my $VERBOSE = 0; -my $GETTEXT_PACKAGE = ""; -my $OUTPUT_FILE = ""; - -my @languages; -my %varhash = (); -my %po_files_by_lang = (); - -# Regular expressions to categorize file types. -# FIXME: Please check if the following is correct - -my $xml_support = -"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required) -"ui|". # Bonobo specific - User Interface desc. files -"lang|". # ? -"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) -"scm(?:\\.in)*|". # ? (Note: .in is not required) -"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files -"etspec|". # ? -"server(?:\\.in)+|". # Bonobo specific -"sheet(?:\\.in)+|". # ? -"schemas(?:\\.in)+|". # GConf specific -"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. -"kbd(?:\\.in)+"; # GOK specific. - -my $ini_support = -"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"caves(?:\\.in)+|". # GNOME Games specific -"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"soundlist(?:\\.in)+|". # GNOME specific -"keys(?:\\.in)+|". # GNOME Mime database specific -"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"service(?:\\.in)+"; # DBus specific - -my $buildin_gettext_support = -"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; - -## Always flush buffer when printing -$| = 1; - -## Sometimes the source tree will be rooted somewhere else. -my $SRCDIR = "."; -my $POTFILES_in; - -$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"}; -$POTFILES_in = "<$SRCDIR/POTFILES.in"; - -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "dist|d" => \$DIST_ARG, - "pot|p" => \$POT_ARG, - "headers|s" => \$HEADERS_ARG, - "maintain|m" => \$MAINTAIN_ARG, - "report|r" => \$REPORT_ARG, - "verbose|x" => \$VERBOSE, - "gettext-package|g=s" => \$GETTEXT_PACKAGE, - "output-file|o=s" => \$OUTPUT_FILE, - ) or &Console_WriteError_InvalidOption; - -&Console_Write_IntltoolHelp if $HELP_ARG; -&Console_Write_IntltoolVersion if $VERSION_ARG; - -my $arg_count = ($DIST_ARG > 0) - + ($POT_ARG > 0) - + ($HEADERS_ARG > 0) - + ($MAINTAIN_ARG > 0) - + ($REPORT_ARG > 0); - -&Console_Write_IntltoolHelp if $arg_count > 1; - -# --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown"; - -if ($POT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; -} -elsif ($HEADERS_ARG) -{ - &GenerateHeaders; -} -elsif ($MAINTAIN_ARG) -{ - &FindLeftoutFiles; -} -elsif ($REPORT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; - &Console_Write_CoverageReport; -} -elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) -{ - my $lang = $ARGV[0]; - - ## Report error if the language file supplied - ## to the command line is non-existent - &Console_WriteError_NotExisting("$SRCDIR/$lang.po") - if ! -s "$SRCDIR/$lang.po"; - - if (!$DIST_ARG) - { - print "Working, please wait..." if $VERBOSE; - &GenerateHeaders; - &GeneratePOTemplate; - } - &POFile_Update ($lang, $OUTPUT_FILE); - &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE); -} -else -{ - &Console_Write_IntltoolHelp; -} - -exit; - -######### - -sub Console_Write_IntltoolVersion -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -sub Console_Write_IntltoolHelp -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... LANGCODE -Updates PO template files and merge them with the translations. - -Mode of operation (only one is allowed): - -p, --pot generate the PO template only - -s, --headers generate the header files in POTFILES.in - -m, --maintain search for left out files from POTFILES.in - -r, --report display a status report for the module - -d, --dist merge LANGCODE.po with existing PO template - -Extra options: - -g, --gettext-package=NAME override PO template name, useful with --pot - -o, --output-file=FILE write merged translation to FILE - -x, --verbose display lots of feedback - --help display this help and exit - --version output version information and exit - -Examples of use: -${PROGRAM} --pot just create a new PO template -${PROGRAM} xy create new PO template and merge xy.po with it - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -sub echo_n -{ - my $str = shift; - my $ret = `echo "$str"`; - - $ret =~ s/\n$//; # do we need the "s" flag? - - return $ret; -} - -sub POFile_DetermineType ($) -{ - my $type = $_; - my $gettext_type; - - my $xml_regex = "(?:" . $xml_support . ")"; - my $ini_regex = "(?:" . $ini_support . ")"; - my $buildin_regex = "(?:" . $buildin_gettext_support . ")"; - - if ($type =~ /\[type: gettext\/([^\]].*)]/) - { - $gettext_type=$1; - } - elsif ($type =~ /schemas(\.in)+$/) - { - $gettext_type="schemas"; - } - elsif ($type =~ /glade2?(\.in)*$/) - { - $gettext_type="glade"; - } - elsif ($type =~ /scm(\.in)*$/) - { - $gettext_type="scheme"; - } - elsif ($type =~ /keys(\.in)+$/) - { - $gettext_type="keys"; - } - - # bucket types - - elsif ($type =~ /$xml_regex$/) - { - $gettext_type="xml"; - } - elsif ($type =~ /$ini_regex$/) - { - $gettext_type="ini"; - } - elsif ($type =~ /$buildin_regex$/) - { - $gettext_type="buildin"; - } - else - { - $gettext_type="unknown"; - } - - return "gettext\/$gettext_type"; -} - -sub TextFile_DetermineEncoding ($) -{ - my $gettext_code="ASCII"; # All files are ASCII by default - my $filetype=`file $_ | cut -d ' ' -f 2`; - - if ($? eq "0") - { - if ($filetype =~ /^(ISO|UTF)/) - { - chomp ($gettext_code = $filetype); - } - elsif ($filetype =~ /^XML/) - { - $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 - } - } - - return $gettext_code; -} - -sub isNotValidMissing -{ - my ($file) = @_; - - return if $file =~ /^\{arch\}\/.*$/; - return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; -} - -sub FindLeftoutFiles -{ - my (@buf_i18n_plain, - @buf_i18n_xml, - @buf_i18n_xml_unmarked, - @buf_i18n_ini, - @buf_potfiles, - @buf_potfiles_ignore, - @buf_allfiles, - @buf_allfiles_sorted, - @buf_potfiles_sorted - ); - - ## Search and find all translatable files - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, ".."; - - - open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; - @buf_potfiles = grep !/^(#|\s*$)/, ; - close POTFILES; - - foreach (@buf_potfiles) { - s/^\[.*]\s*//; - } - - print "Searching for missing translatable files...\n" if $VERBOSE; - - ## Check if we should ignore some found files, when - ## comparing with POTFILES.in - foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") - { - (-s $ignore) or next; - - if ("$ignore" eq "POTFILES.ignore") - { - print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". - "content of this file to POTFILES.skip.\n"; - } - - print "Found $ignore: Ignoring files...\n" if $VERBOSE; - open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n"; - - while () - { - push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; - } - close FILE; - - @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); - } - - foreach my $file (@buf_i18n_plain) - { - my $in_comment = 0; - my $in_macro = 0; - - open FILE, "<$file"; - while () - { - # Handle continued multi-line comment. - if ($in_comment) - { - next unless s-.*\*/--; - $in_comment = 0; - } - - # Handle continued macro. - if ($in_macro) - { - $in_macro = 0 unless /\\$/; - next; - } - - # Handle start of macro (or any preprocessor directive). - if (/^\s*\#/) - { - $in_macro = 1 if /^([^\\]|\\.)*\\$/; - next; - } - - # Handle comments and quoted text. - while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy - { - my $match = $1; - if ($match eq "/*") - { - if (!s-/\*.*?\*/--) - { - s-/\*.*--; - $in_comment = 1; - } - } - elsif ($match eq "//") - { - s-//.*--; - } - else # ' or " - { - if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) - { - warn "mismatched quotes at line $. in $file\n"; - s-$match.*--; - } - } - } - - if (/\.GetString ?\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - - if (/_\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml) - { - open FILE, "<$file"; - - while () - { - # FIXME: share the pattern matching code with intltool-extract - if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_ini) - { - open FILE, "<$file"; - while () - { - if (/_(.*)=/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml_unmarked) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - } - - - @buf_allfiles_sorted = sort (@buf_allfiles); - @buf_potfiles_sorted = sort (@buf_potfiles); - - my %in2; - foreach (@buf_potfiles_sorted) - { - $in2{$_} = 1; - } - - my @result; - - foreach (@buf_allfiles_sorted) - { - if (!exists($in2{$_})) - { - push @result, $_ - } - } - - my @buf_potfiles_notexist; - - foreach (@buf_potfiles_sorted) - { - chomp (my $dummy = $_); - if ("$dummy" ne "" and ! -f "../$dummy") - { - push @buf_potfiles_notexist, $_; - } - } - - ## Save file with information about the files missing - ## if any, and give information about this procedure. - if (@result + @buf_potfiles_notexist > 0) - { - if (@result) - { - print "\n" if $VERBOSE; - unlink "missing"; - open OUT, ">missing"; - print OUT @result; - close OUT; - warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". - "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; - print STDERR @result, "\n"; - warn "If some of these files are left out on purpose then please add them to\n". - "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". - "of left out files has been written in the current directory.\n"; - } - if (@buf_potfiles_notexist) - { - unlink "notexist"; - open OUT, ">notexist"; - print OUT @buf_potfiles_notexist; - close OUT; - warn "\n" if ($VERBOSE or @result); - warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; - warn @buf_potfiles_notexist, "\n"; - warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n". - "containing this list of absent files has been written in the current directory.\n"; - } - } - - ## If there is nothing to complain about, notify the user - else { - print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; - } -} - -sub Console_WriteError_InvalidOption -{ - ## Handle invalid arguments - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit 1; -} - -sub GenerateHeaders -{ - my $EXTRACT = "@INTLTOOL_EXTRACT@"; - chomp $EXTRACT; - - $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"}; - - ## Generate the .h header files, so we can allow glade and - ## xml translation support - if (! -x "$EXTRACT") - { - print STDERR "\n *** The intltool-extract script wasn't found!" - ."\n *** Without it, intltool-update can not generate files.\n"; - exit; - } - else - { - open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n"; - - while () - { - chomp; - next if /^\[\s*encoding/; - - ## Find xml files in POTFILES.in and generate the - ## files with help from the extract script - - my $gettext_type= &POFile_DetermineType ($1); - - if (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[[^\[].*]\s*//; - - my $filename = "../$_"; - - if ($VERBOSE) - { - system ($EXTRACT, "--update", "--srcdir=$SRCDIR", - "--type=$gettext_type", $filename); - } - else - { - system ($EXTRACT, "--update", "--type=$gettext_type", - "--srcdir=$SRCDIR", "--quiet", $filename); - } - } - } - close FILE; - } -} - -# -# Generate .pot file from POTFILES.in -# -sub GeneratePOTemplate -{ - my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; - my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; - chomp $XGETTEXT; - - if (! -x $XGETTEXT) - { - print STDERR " *** xgettext is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Building $MODULE.pot...\n" if $VERBOSE; - - open INFILE, $POTFILES_in; - unlink "POTFILES.in.temp"; - open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing"); - - my $gettext_support_nonascii = 0; - - # checks for GNU gettext >= 0.12 - my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`; - if ($? == 0) - { - $gettext_support_nonascii = 1; - } - else - { - # urge everybody to upgrade gettext - print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". - " strings. That means you should install a version of gettext\n". - " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". - " or have to let non-ASCII strings untranslated. (If there is any)\n"; - } - - my $encoding = "ASCII"; - my $forced_gettext_code; - my @temp_headers; - my $encoding_problem_is_reported = 0; - - while () - { - next if (/^#/ or /^\s*$/); - - chomp; - - my $gettext_code; - - if (/^\[\s*encoding:\s*(.*)\s*\]/) - { - $forced_gettext_code=$1; - } - elsif (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[.*]\s*//; - print OUTFILE "../$_.h\n"; - push @temp_headers, "../$_.h"; - $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - else - { - if ($SRCDIR eq ".") { - print OUTFILE "../$_\n"; - } else { - print OUTFILE "$SRCDIR/../$_\n"; - } - $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - - next if (! $gettext_support_nonascii); - - if (defined $forced_gettext_code) - { - $encoding=$forced_gettext_code; - } - elsif (defined $gettext_code and "$encoding" ne "$gettext_code") - { - if ($encoding eq "ASCII") - { - $encoding=$gettext_code; - } - elsif ($gettext_code ne "ASCII") - { - # Only report once because the message is quite long - if (! $encoding_problem_is_reported) - { - print STDERR "WARNING: You should use the same file encoding for all your project files,\n". - " but $PROGRAM thinks that most of the source files are in\n". - " $encoding encoding, while \"$_\" is (likely) in\n". - " $gettext_code encoding. If you are sure that all translatable strings\n". - " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". - " line to POTFILES.in:\n\n". - " [encoding: UTF-8]\n\n". - " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". - "(such warning message will only be reported once.)\n"; - $encoding_problem_is_reported = 1; - } - } - } - } - - close OUTFILE; - close INFILE; - - unlink "$MODULE.pot"; - my @xgettext_argument=("$XGETTEXT", - "--add-comments", - "--directory\=\.", - "--output\=$MODULE\.pot", - "--files-from\=\.\/POTFILES\.in\.temp"); - my $XGETTEXT_KEYWORDS = &FindPOTKeywords; - push @xgettext_argument, $XGETTEXT_KEYWORDS; - my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; - push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); - push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; - my $xgettext_command = join ' ', @xgettext_argument; - - # intercept xgettext error message - print "Running $xgettext_command\n" if $VERBOSE; - my $xgettext_error_msg = `$xgettext_command 2>\&1`; - my $command_failed = $?; - - unlink "POTFILES.in.temp"; - - print "Removing generated header (.h) files..." if $VERBOSE; - unlink foreach (@temp_headers); - print "done.\n" if $VERBOSE; - - if (! $command_failed) - { - if (! -e "$MODULE.pot") - { - print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; - } - else - { - print "Wrote $MODULE.pot\n" if $VERBOSE; - } - } - else - { - if ($xgettext_error_msg =~ /--from-code/) - { - # replace non-ASCII error message with a more useful one. - print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". - " string marked for translation. Please make sure that all strings marked\n". - " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". - " following line to POTFILES.in and rerun $PROGRAM:\n\n". - " [encoding: UTF-8]\n\n"; - } - else - { - print STDERR "$xgettext_error_msg"; - if (-e "$MODULE.pot") - { - # is this possible? - print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". - " Please consult error message above if there is any.\n"; - } - else - { - print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". - " error message above if there is any.\n"; - } - } - exit (1); - } -} - -sub POFile_Update -{ - -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - - my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; - my ($lang, $outfile) = @_; - - print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; - - my $infile = "$SRCDIR/$lang.po"; - $outfile = "$SRCDIR/$lang.po" if ($outfile eq ""); - - # I think msgmerge won't overwrite old file if merge is not successful - system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot"); -} - -sub Console_WriteError_NotExisting -{ - my ($file) = @_; - - ## Report error if supplied language file is non-existing - print STDERR "$PROGRAM: $file does not exist!\n"; - print STDERR "Try '$PROGRAM --help' for more information.\n"; - exit; -} - -sub GatherPOFiles -{ - my @po_files = glob ("./*.po"); - - @languages = map (&POFile_GetLanguage, @po_files); - - foreach my $lang (@languages) - { - $po_files_by_lang{$lang} = shift (@po_files); - } -} - -sub POFile_GetLanguage ($) -{ - s/^(.*\/)?(.+)\.po$/$2/; - return $_; -} - -sub Console_Write_TranslationStatus -{ - my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; - - $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); - - system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file); -} - -sub Console_Write_CoverageReport -{ - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; - - &GatherPOFiles; - - foreach my $lang (@languages) - { - print "$lang: "; - &POFile_Update ($lang, ""); - } - - print "\n\n * Current translation support in $MODULE \n\n"; - - foreach my $lang (@languages) - { - print "$lang: "; - system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); - } -} - -sub SubstituteVariable -{ - my ($str) = @_; - - # always need to rewind file whenever it has been accessed - seek (CONF, 0, 0); - - # cache each variable. varhash is global to we can add - # variables elsewhere. - while () - { - if (/^(\w+)=(.*)$/) - { - ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/; - } - } - - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; - my $sub = ""; - # Ignore recursive definitions of variables - $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; - - return SubstituteVariable ("$untouched$sub$rest"); - } - - # We're using Perl backticks ` and "echo -n" here in order to - # expand any shell escapes (such as backticks themselves) in every variable - return echo_n ($str); -} - -sub CONF_Handle_Open -{ - my $base_dirname = getcwd(); - $base_dirname =~ s@.*/@@; - - my ($conf_in, $src_dir); - - if ($base_dirname =~ /^po(-.+)?$/) - { - if (-f "Makevars") - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_builddir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - if (-f "$src_dir" . "/configure.ac") { - $conf_in = "$src_dir" . "/configure.ac" . "\n"; - } else { - $conf_in = "$src_dir" . "/configure.in" . "\n"; - } - last; - } - } - close IN; - - $conf_in || die "Cannot find top_builddir in Makevars."; - } - elsif (-f "../configure.ac") - { - $conf_in = "../configure.ac"; - } - elsif (-f "../configure.in") - { - $conf_in = "../configure.in"; - } - else - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_srcdir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - $conf_in = "$src_dir" . "/configure.in" . "\n"; - - last; - } - } - close IN; - - $conf_in || die "Cannot find top_srcdir in Makefile."; - } - - open (CONF, "<$conf_in"); - } - else - { - print STDERR "$PROGRAM: Unable to proceed.\n" . - "Make sure to run this script inside the po directory.\n"; - exit; - } -} - -sub FindPackageName -{ - my $version; - my $domain = &FindMakevarsDomain; - my $name = $domain || "untitled"; - - &CONF_Handle_Open; - - my $conf_source; { - local (*IN); - open (IN, "<&CONF") || return $name; - seek (IN, 0, 0); - local $/; # slurp mode - $conf_source = ; - close IN; - } - - # priority for getting package name: - # 1. GETTEXT_PACKAGE - # 2. first argument of AC_INIT (with >= 2 arguments) - # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) - - # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m - # the \s makes this not work, why? - if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - # \s makes this not work, why? - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; - - # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value - # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. - $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; - - $name = $domain if $domain; - - $name = SubstituteVariable ($name); - $name =~ s/^["'](.*)["']$/$1/; - - return $name if $name; -} - - -sub FindPOTKeywords -{ - - my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_"; - my $varname = "XGETTEXT_OPTIONS"; - my $make_source; { - local (*IN); - open (IN, "; - close IN; - } - - $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; - - return $keywords; -} - -sub FindMakevarsDomain -{ - - my $domain = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m; - $domain =~ s/^\s+//; - $domain =~ s/\s+$//; - - return $domain; -} - -sub FindMakevarsBugAddress -{ - - my $address = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m; - $address =~ s/^\s+//; - $address =~ s/\s+$//; - - return $address; -} diff --git a/packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch b/packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch deleted file mode 100644 index 04d6b4b8c1..0000000000 --- a/packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- openmoko/po/LINGUAS.orig 2007-03-08 11:07:44.000000000 +0000 -+++ openmoko/po/LINGUAS 2007-03-08 11:07:52.000000000 +0000 -@@ -1,5 +1,4 @@ - et - fr - nl --pl - ru diff --git a/packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch b/packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch deleted file mode 100644 index 4740612a8b..0000000000 --- a/packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/dates_navigator.c 2007-02-15 13:36:27.000000000 +0100 -+++ omoko/src/dates_navigator.c 2007-02-15 13:36:35.435251000 +0100 -@@ -21,7 +21,6 @@ - #include - #include - #include --#include - - #include - #include diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 58f07c7eb5..5d52871ecd 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -1,27 +1,29 @@ -DESCRIPTION = "Dates is a calendar application." +DESCRIPTION = "The OpenMoko Dates Application" SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -RCONFLICTS_${PN} = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r8" +PR = "r9" inherit gnome autotools pkgconfig gtk-icon-cache SRC_URI = "svn://svn.o-hand.com/repos/dates/branches/;module=openmoko;proto=http \ - file://om-dates-temp-buildfix_20070308.patch;maxdate=20070406;patch=p1" + file://openmoko-dates.png \ + file://openmoko-dates.desktop" S = "${WORKDIR}/openmoko" EXTRA_OECONF = "--enable-omoko" do_install_append () { + rm -rf ${D}${datadir}/icons + rm -rf ${D}${datadir}/applications/dates.desktop install -d ${D}/${datadir}/pixmaps - install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/openmoko-dates.png ${D}/${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/openmoko-dates.desktop ${D}${datadir}/applications/ } -FILES_${PN} += "${datadir}/pixmaps/dates.png \ +FILES_${PN} += "${datadir}/pixmaps \ ${datadir}/dates/" -PRIVATE_LIBS = "libgtkdatesview.so.0" diff --git a/packages/openmoko-pim/openmoko-tasks_svn.bb b/packages/openmoko-pim/openmoko-tasks_svn.bb new file mode 100644 index 0000000000..b3c627e621 --- /dev/null +++ b/packages/openmoko-pim/openmoko-tasks_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The OpenMoko Tasks Application" +SECTION = "openmoko/pim" +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" +RDEPENDS = "libedata-cal" +PV = "0.1+svn${SRCDATE}" +PR = "r0" + +inherit gnome autotools pkgconfig gtk-icon-cache + +SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--enable-omoko --disable-gtk" + diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index 74e79b85f1..da5a961671 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" -DEPENDS = "openmoko-libs eds-dbus" +DEPENDS = "openmoko-libs eds-dbus startup-notification" PV = "0.1+svn${SRCDATE}" inherit autotools pkgconfig gtk-icon-cache openmoko -- 2.39.5