Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
$NetBSD: patch-aa,v 1.1.1.1 2007/12/12 08:34:16 obache Exp $
--- src/preference.c.orig 2005-10-05 09:41:23.000000000 +0900
+++ src/preference.c 2005-10-05 10:11:16.000000000 +0900
@@ -400,7 +400,7 @@ void calculate_font_size(){
PangoFontDescription* desc;
PangoLanguage* lang;
PangoFontMap* fontmap;
-#ifndef __WIN32__
+#if !GTK_CHECK_VERSION(2,8,0) && !defined(__WIN32__)
Display *display;
#endif
PangoContext *context;
@@ -420,6 +420,9 @@ void calculate_font_size(){
desc = pango_font_description_from_string(fontset_normal);
lang = pango_language_from_string("ja");
+#if GTK_CHECK_VERSION(2,8,0)
+ fontmap = pango_cairo_font_map_get_default();
+#else
#ifdef __WIN32__
fontmap = pango_win32_font_map_for_display();
#else
@@ -430,7 +433,8 @@ void calculate_font_size(){
}
fontmap = pango_x_font_map_for_display(display);
-#endif
+#endif /* __WIN32__ */
+#endif /* GTK_CHECK_VERSION(2,8,0) */
if(fontmap == NULL){
LOG(LOG_INFO, "fontmap == NULL");

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.1.1.1 2007/12/12 08:34:16 obache Exp $
--- src/ebview.c.orig 2007-11-10 20:57:09.000000000 +0900
+++ src/ebview.c 2007-11-10 20:57:27.000000000 +0900
@@ -15,8 +15,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define GTK_DISABLE_DEPRECATED 1
-
#define _GLOBAL
#include <signal.h>
#include <pthread.h>

View File

@@ -0,0 +1,21 @@
$NetBSD: patch-ac,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- data/Makefile.in.orig 2009-02-16 15:39:52.000000000 +0100
+++ data/Makefile.in
@@ -304,13 +304,13 @@ check: all
install:
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(pkgdatadir); \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir); \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(pkgdatadir); \
fi; \
data="$(data)"; \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$file ${DESTDIR}$(pkgdatadir)/$$file; \
done;
# Define this as empty until I found a useful application.

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-ad,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- doc/Makefile.in.orig 2009-02-16 15:46:52.000000000 +0100
+++ doc/Makefile.in
@@ -308,15 +308,15 @@ install:
dir="$(dir)"; \
for lang in $$dir; do \
if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \
+ $(MKINSTALLDIRS) ${DESTDIR}$(pkgdatadir)/help/$$lang; \
else \
- $(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(pkgdatadir)/help/$$lang; \
fi; \
done; \
data="$(data)"; \
for lang in $$dir; do \
for file in $$data; do \
- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \
+ $(INSTALL_DATA) $(srcdir)/$$lang/$$file ${DESTDIR}$(pkgdatadir)/help/$$lang/$$file; \
done; \
done;

View File

@@ -0,0 +1,25 @@
$NetBSD: patch-ae,v 1.1 2009/02/19 16:43:13 joerg Exp $
--- po/Makefile.in.in.orig 2009-02-19 17:39:10.000000000 +0100
+++ po/Makefile.in.in
@@ -115,9 +115,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(datadir); \
+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -127,7 +127,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_jcode.h,v 1.1 2012/06/25 11:47:22 joerg Exp $
--- src/jcode.h.orig 2012-06-22 20:55:45.000000000 +0000
+++ src/jcode.h
@@ -31,7 +31,7 @@ enum {
gchar *iconv_convert(const gchar *icode, const gchar *ocode, const gchar *inbuf);
gchar *iconv_convert2(const gchar *icode, const gchar *ocode, const gchar *orig);
-inline gboolean isjisp(const gchar *buff);
+gboolean isjisp(const gchar *buff);
gboolean iseuckanji(const guchar *buff);
gboolean iseuchiragana(const guchar *buff);
gboolean iseuckatakana(const guchar *buff);