cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- enable locales

Browse Source 
- correct display of mark symbols

fix from joint work between pea@raveland.org (maintainer)
and upstream author.

"go ahead" antoine@
This commit is contained in:
jasper 2008-04-22 08:57:24 +00:00
parent ae4f085b3a
commit 4b569347fd
8 changed files with 93 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
productivity/osmo/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2008/02/15 14:36:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2008/04/22 08:57:24 jasper Exp $
COMMENT= handy personal organizer
DISTNAME= osmo-0.2.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= productivity
HOMEPAGE= http://clay.ll.pl/osmo/
@ -38,4 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
BUILD_CFLAGS="${CFLAGS}"
pre-configure:
perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' ${WRKSRC}/po/Makefile.in
.include <bsd.port.mk>

12
productivity/osmo/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/02/15 14:36:24 ajacoutot Exp $
--- Makefile.in.orig Sat Feb 9 00:58:29 2008
+++ Makefile.in Fri Feb 15 15:23:49 2008
@@ -165,7 +165,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
var = @var@
-SUBDIRS = src po
+SUBDIRS = src
ACLOCAL_AMFLAGS = -I m4
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = osmo.svg osmo.png

16
productivity/osmo/patches/patch-po_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-po_Makefile_in,v 1.1 2008/04/22 08:57:24 jasper Exp $
--- po/Makefile.in.orig Sat Apr 19 23:07:18 2008
+++ po/Makefile.in Sat Apr 19 23:07:35 2008
@@ -128,9 +128,9 @@ top_srcdir = @top_srcdir@
var = @var@
DOMAIN = osmo
POTFILES = $(wildcard ../src/*.c ../src/*.h)
-MSGFMT = /usr/bin/msgfmt
-XGETTEXT = /usr/bin/xgettext
-MSGMERGE = /usr/bin/msgmerge
+MSGFMT = !!LOCALBASE!!/bin/msgfmt
+XGETTEXT = !!LOCALBASE!!/bin/xgettext
+MSGMERGE = !!LOCALBASE!!/bin/msgmerge
XGETTEXT_OPTS = --keyword=_ --keyword=N_ --keyword=X_ --add-comments=TRANSLATORS: --no-location
POFILES = cs.po de.po es.po fr.po lt.po nl.po pl.po pt.po
MOFILES = $(POFILES:.po=.mo)

16
productivity/osmo/patches/patch-src_calendar_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_calendar_c,v 1.1 2008/04/22 08:57:24 jasper Exp $
--- src/calendar.c.orig Sat Apr 19 13:28:02 2008
+++ src/calendar.c Sat Apr 19 13:28:33 2008
@@ -1201,10 +1201,10 @@ gchar *
get_mark_symbol (gint idx) {
gchar *symbols[] = {
- "", "·", "'", "*", "~", "|", "°"
+ "", "'", "*", "~", "|"
};
- return (symbols[idx % 7]);
+ return (symbols[idx % 5]);
}
/*------------------------------------------------------------------------------*/

12
productivity/osmo/patches/patch-src_calendar_widget_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_calendar_widget_c,v 1.1 2008/04/22 08:57:24 jasper Exp $
--- src/calendar_widget.c.orig Fri Apr 18 22:17:10 2008
+++ src/calendar_widget.c Fri Apr 18 22:17:53 2008
@@ -1970,7 +1970,7 @@ calendar_paint_day (GuiCalendar *calendar,
if (calendar->mark_sign) {
if (calendar->marked_date[day-1] && calendar->day_month[row][col] == MONTH_CURRENT) {
- g_snprintf (buffer, sizeof (buffer), "%C%d", calendar->mark_sign, day);
+ g_snprintf (buffer, sizeof (buffer), "%lc%d", calendar->mark_sign, day);
} else {
g_snprintf (buffer, sizeof (buffer), "%d", day);
}

17
productivity/osmo/patches/patch-src_main_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_main_c,v 1.3 2008/04/22 08:57:24 jasper Exp $
--- src/main.c.orig Sun Apr 20 09:48:45 2008
+++ src/main.c Sun Apr 20 09:49:08 2008
@@ -98,9 +98,10 @@ int fhandle;
appGUI->opt->options_counter = 0;
- gtk_set_locale();
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ textdomain (PACKAGE);
if (argc != 1) {
if (argc == 2 && !strncmp(argv[1], "-cal", 4) && strlen(argv[1]) == 4) {

16
productivity/osmo/patches/patch-src_options_gui_calendar_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_options_gui_calendar_c,v 1.1 2008/04/22 08:57:24 jasper Exp $
--- src/options_gui_calendar.c.orig Sat Apr 19 08:59:38 2008
+++ src/options_gui_calendar.c Sat Apr 19 09:00:46 2008
@@ -1352,12 +1352,10 @@ GtkWidget *calendar_ical_files_table;
g_signal_connect (G_OBJECT (appGUI->opt->mark_symbol_combobox), "changed",
G_CALLBACK(mark_symbol_changed_cb), appGUI);
gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Middle dot"));
gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Apostrophe"));
gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Asterisk"));
gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Tilde"));
gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Vertical line"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->opt->mark_symbol_combobox), _("Degree sign"));
gtk_combo_box_set_active (GTK_COMBO_BOX(appGUI->opt->mark_symbol_combobox), config.mark_symbol);

12
productivity/osmo/pkg/PLIST
View File

@ -1,6 +1,16 @@
@comment $OpenBSD: PLIST,v 1.2 2008/02/15 14:36:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2008/04/22 08:57:24 jasper Exp $
bin/osmo
share/applications/osmo.desktop
share/locale/cs/LC_MESSAGES/osmo.mo
share/locale/de/LC_MESSAGES/osmo.mo
share/locale/es/LC_MESSAGES/osmo.mo
share/locale/fr/LC_MESSAGES/osmo.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/osmo.mo
share/locale/nl/LC_MESSAGES/osmo.mo
share/locale/pl/LC_MESSAGES/osmo.mo
share/locale/pt/LC_MESSAGES/osmo.mo
share/pixmaps/
share/pixmaps/osmo.png
share/pixmaps/osmo.svg