--- ebview-0.3.6.2.orig/debian/rules +++ ebview-0.3.6.2/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +# Add here any variable or target overrides you need. + +DEB_CONFIGURE_EXTRA_FLAGS := --sysconfdir=/etc +DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/ebview/usr + +build/ebview:: + $(CC) $(CFLAGS) -o $(CURDIR)/src/ebview-client $(CURDIR)/src/ebview-client.c + +install/ebview:: + install -m 755 $(CURDIR)/src/ebview-client $(CURDIR)/debian/ebview/usr/bin + install -m 644 $(CURDIR)/pixmaps/ebview-32x32.xpm $(CURDIR)/debian/ebview/usr/share/pixmaps/ebview.xpm + install -m 644 $(CURDIR)/debian/ebview.desktop $(CURDIR)/debian/ebview/usr/share/applications + +clean:: + rm -f $(CURDIR)/src/ebview-client + --- ebview-0.3.6.2.orig/debian/changelog +++ ebview-0.3.6.2/debian/changelog @@ -0,0 +1,309 @@ +ebview (0.3.6.2-1.3ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1229841). Remaining changes: + - debian/ebview.desktop: + + Removed value "Application;GTK;" for key "Categories" in group + "Desktop Entry"(deprecated). + + Add value "Office;Utility;TextTools;" for key "Categories" in group + "Desktop Entry" to match current desktop menu specification. + + -- Logan Rosen Tue, 29 Oct 2013 23:13:10 -0400 + +ebview (0.3.6.2-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Fix build failure, not using pangox. Patch taken from #701840. + Closes: #713240. + * Link ebview with -lX11. + + -- Matthias Klose Tue, 29 Oct 2013 00:11:14 +0100 + +ebview (0.3.6.2-1.2ubuntu1) precise; urgency=low + + * Merge from Debian testing. (LP: #901041) Remaining changes: + - debian/ebview.desktop: + + Removed value "Application;GTK;" for key "Categories" in group + "Desktop Entry"(deprecated). + + Add value "Office;Utility;TextTools;" for key "Categories" in group + "Desktop Entry" to match current desktop menu specification. + + -- Mahyuddin Susanto Wed, 07 Dec 2011 09:51:08 +0700 + +ebview (0.3.6.2-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: dialog.c:72:6: error: format not a string literal and no + format arguments [-Werror=format-security]": + add patch fix-string-format-error.patch from Eric Alexander. + (Closes: #643375) + + -- gregor herrmann Sun, 20 Nov 2011 14:59:26 +0100 + +ebview (0.3.6.2-1.1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + + debian/ebview.desktop: + - Removed value "Application" for key "Categories" in group + "Desktop Entry"(deprecated). (Closes: #542485) + + -- Bhavani Shankar Thu, 19 May 2011 11:06:47 +0530 + +ebview (0.3.6.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build-depends on libeb16-dev instead of libeb13-dev (Closes: #623456). + + -- Luca Falavigna Sun, 15 May 2011 01:08:02 +0200 + +ebview (0.3.6.2-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #414388 + + debian/ebview.desktop + - Removed value "Application" for key "Categories" in group + "Desktop Entry"(deprecated) + + -- Bhavani Shankar Sun, 16 Aug 2009 16:18:14 +0530 + +ebview (0.3.6.2-1) unstable; urgency=low + + * New upstream (though unofficial) release. + + -- Masayuki Hatta (mhatta) Sun, 16 Aug 2009 07:56:21 +0900 + +ebview (0.3.6.1-1) unstable; urgency=low + + * New upstream (though unofficial) release. + * Converted to CDBS. + * Rebuilt with libeb13 - closes: #539005 + + -- Masayuki Hatta (mhatta) Sat, 15 Aug 2009 08:17:47 +0900 + +ebview (0.3.6-9ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/ebview.desktop + - Removed value "Application" for key "Categories" in group "Desktop Entry" + (deprecated) + + -- Emanuele Gentili Thu, 17 Jul 2008 16:38:31 +0200 + +ebview (0.3.6-9) unstable; urgency=low + + * Added ebview.desktop, thanks fueryuejing - closes: #471002 + * Bumped to Standards-Version: 3.8.0. + + -- Masayuki Hatta (mhatta) Wed, 16 Jul 2008 10:40:02 +0900 + +ebview (0.3.6-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #237423): + - Added ebview.desktop file written by fueryuejing. (LP: #201714) + + -- Nathan Handler Wed, 04 Jun 2008 14:01:45 -0500 + +ebview (0.3.6-8) unstable; urgency=low + + * Added ebview-client (but doesn't work currently) - closes: #459694 + + -- Masayuki Hatta (mhatta) Tue, 08 Jan 2008 14:49:51 +0900 + +ebview (0.3.6-7ubuntu1) hardy; urgency=low + + * Added ebview.desktop file written by fueryuejing. (LP: #201714) + + -- Mitsuya Shibata Thu, 13 Mar 2008 23:06:36 +0900 + +ebview (0.3.6-7) unstable; urgency=low + + * Seems what I really need to do was running autoreconf... + + -- Masayuki Hatta (mhatta) Tue, 11 Dec 2007 03:27:38 +0900 + +ebview (0.3.6-6) unstable; urgency=low + + * Added automake | automaken to Build-Deps. Seems automake is + needed to build this package on some archs (at least powerpc). + I'm not sure why... + + -- Masayuki Hatta (mhatta) Tue, 11 Dec 2007 02:46:24 +0900 + +ebview (0.3.6-5) unstable; urgency=low + + * Bumped to Standards-Version: 3.7.3. + * Fixed various lintian warnings. + + -- Masayuki Hatta (mhatta) Thu, 06 Dec 2007 22:15:47 +0900 + +ebview (0.3.6-4) unstable; urgency=low + + * Maintainer upload. + * Acknowledged NMU, thanks Cyril - closes: #444523 + * Applied display popup window fix from Ubuntu - closes: #450595 + + -- Masayuki Hatta (mhatta) Tue, 04 Dec 2007 20:56:38 +0900 + +ebview (0.3.6-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Comment the “#define GTK_DISABLE_DEPRECATED 1” line in src/ebview.c to + avoid FTBFS due to the Gtk 2.12 transition (Closes: #444523). + * Move menu section from “Apps/Text” to “Applications/Text”, due to the menu + transition. + * No longer ignore “make distclean” errors, per lintian. + + -- Cyril Brulebois Tue, 09 Oct 2007 01:52:26 +0200 + +ebview (0.3.6-3) unstable; urgency=low + + * Maintainer upload. + * Acknowledged NMU - closes: #410444, #414460 + * Ran autoreconf -i - closes: #417404 + + -- Masayuki Hatta (mhatta) Tue, 01 May 2007 16:51:00 +0900 + +ebview (0.3.6-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libeb12-dev rather than on libeb7-dev. (Closes: #410444) + * automaken is not necessary to build ebview, build dependency dropped. + (Closes: #414460) + + -- Emanuele Rocca Sun, 18 Mar 2007 23:37:27 +0100 + +ebview (0.3.6-2) unstable; urgency=low + + * Bumped to Standards-Version: 3.7.2. + * Acknowledged NMU, thanks Mario - closes: #355323 + * Fixed FSF's address. + * Converted the menu icon to 32x32. + + -- Masayuki Hatta (mhatta) Sun, 8 Oct 2006 18:30:40 +0900 + +ebview (0.3.6-1.1) unstable; urgency=medium + + * Non-maintainer upload, BSP Zurich/Switzerland. + * Fix a FTBFS (Closes: #355323) + - Link now against libpangox + - Added some macros to configure.in for PANGOX + + -- Mario Iseli Sat, 9 Sep 2006 16:29:05 +0200 + +ebview (0.3.6-1) unstable; urgency=high + + * The "Brief Return From The Hell" release. + * New upstream release. + * Acknowledged NMU - closes: #250122 + * Now suggests (recommends may be too strong) edict-fpw - closes: #258893 + * Now installs the icon and revised menu - closes: #258892 + + -- Masayuki Hatta (mhatta) Sun, 8 Aug 2004 04:15:23 +0900 + +ebview (0.3.5-1.1) unstable; urgency=medium + + * NMU + * Fix for GTK+2.4 build fail (closes: Bug#250122) + + -- Kenshi Muto Sat, 10 Jul 2004 09:43:16 +0000 + +ebview (0.3.5-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta (mhatta) Mon, 8 Mar 2004 01:27:33 +0900 + +ebview (0.3.3-2) unstable; urgency=low + + * [control] changed Maintainer field. + + -- Masayuki Hatta (mhatta) Mon, 9 Feb 2004 14:31:41 +0900 + +ebview (0.3.3-1) unstable; urgency=low + + * New upstream release. + + -- Masayuki Hatta (mhatta) Sat, 7 Feb 2004 17:19:12 +0900 + +ebview (0.3.1-3) unstable; urgency=low + + * Rebuilt with new gtk+2.0. + + -- Masayuki Hatta Tue, 7 Oct 2003 00:07:07 +0900 + +ebview (0.3.1-2) unstable; urgency=low + + * Linked with libeb7. + + -- Masayuki Hatta Tue, 16 Sep 2003 08:53:23 +0900 + +ebview (0.3.1-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Sun, 6 Jul 2003 20:32:04 +0900 + +ebview (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Sat, 24 May 2003 17:07:16 +0900 + +ebview (0.2.1-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Sun, 27 Apr 2003 19:26:38 +0900 + +ebview (0.2.0-2) unstable; urgency=low + + * Bumped to Standards-Version: 3.5.9. + * Linked with new eb. + + -- Masayuki Hatta Mon, 21 Apr 2003 21:48:49 +0900 + +ebview (0.2.0-1) unstable; urgency=low + + * New upstream release + * Build-Depends: automake1.7 + * Bumped to Standards-Version: 3.5.8. + + -- Masayuki Hatta Sat, 21 Dec 2002 20:00:32 +0900 + +ebview (0.1.5p1-4) unstable; urgency=low + + * Built with imlib1-dev/gdk-imlib1-dev. + + -- Masayuki Hatta Fri, 30 Aug 2002 10:13:37 +0900 + +ebview (0.1.5p1-3) unstable; urgency=low + + * Built with new gdk-imlib-dev. + + -- Masayuki Hatta Wed, 21 Aug 2002 11:58:36 +0900 + +ebview (0.1.5p1-2) unstable; urgency=low + + * Added automake to Build-Depends - closes: #153073 + + -- Masayuki Hatta Tue, 16 Jul 2002 15:05:31 +0900 + +ebview (0.1.5p1-1) unstable; urgency=low + + * New upstream release(applied ebview-0.1.5.patch1). + * Added gdk-imlib-dev to Build-Depends - closes: #150906 + * Improved description - closes: #150885 + + -- Masayuki Hatta Mon, 15 Jul 2002 20:51:29 +0900 + +ebview (0.1.5-1) unstable; urgency=low + + * New upstream release. + * Initial release for Debian Project - closes: #149459 + + -- Masayuki Hatta Sun, 9 Jun 2002 23:44:58 +0900 + +ebview (0.1.4-1) unstable; urgency=low + + * Initial Release. + + -- Masayuki Hatta Mon, 25 Feb 2002 09:55:47 +0900 + --- ebview-0.3.6.2.orig/debian/compat +++ ebview-0.3.6.2/debian/compat @@ -0,0 +1 @@ +7 --- ebview-0.3.6.2.orig/debian/copyright +++ ebview-0.3.6.2/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by: + + Masayuki Hatta (mhatta) on Sat, 15 Aug 2009 10:00:19 +0900 + +It was downloaded from: + + http://ebview.sourceforge.net/ + +Upstream Author: + + Kenichi SUTO + +Copyright: + + Copyright (C) 2001- Kenichi SUTO + +License: + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This package 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, see . + +On Debian systems, the complete text of the GNU General +Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is: + + Copyright (C) 2009 Masayuki Hatta (mhatta) + +and is licensed under the GPL version 3, see above. --- ebview-0.3.6.2.orig/debian/ebview.sgml +++ ebview-0.3.6.2/debian/ebview.sgml @@ -0,0 +1,113 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +ebview.1: ebview.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Masayuki"> + Hatta"> + + Febrary 25, 2002"> + + 1"> + mhatta@debian.org"> + + EBVIEW"> + + + Debian"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2002 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + An EPWING CD-ROM dictionary viewer + + + + &dhpackage; + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; commands. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a program that... + + &dhpackage; is an EPWING CD-ROM + dictionary viewer using libeb. It uses libeb and supports + EPWING format. It can read multiple dictionary at same time and + can search words on X11 cut-buffer automatically. + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + + + + --- ebview-0.3.6.2.orig/debian/ebview.desktop +++ ebview-0.3.6.2/debian/ebview.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=EBView +Name[ja]=EBView 辞書ブラウザ +Comment=EPWING CD-ROM dictionary viewer +Comment[ja]=EPWING形式のCD-ROM辞書を検索します +Icon=/usr/share/pixmaps/ebview.xpm +Exec=/usr/bin/ebview +StartupNotify=true +Terminal=false +Type=Application +Categories=Office;Utility;TextTools;Dictionary; +MimeType=application/ebview; --- ebview-0.3.6.2.orig/debian/ebview.manpages +++ ebview-0.3.6.2/debian/ebview.manpages @@ -0,0 +1 @@ +debian/ebview.1 --- ebview-0.3.6.2.orig/debian/menu +++ ebview-0.3.6.2/debian/menu @@ -0,0 +1,4 @@ +?package(ebview):needs="X11" section="Applications/Text"\ + longtitle="EPWING dictionary viewer"\ + icon="/usr/share/pixmaps/ebview.xpm"\ + title="EBView" command="/usr/bin/ebview" --- ebview-0.3.6.2.orig/debian/ebview.1 +++ ebview-0.3.6.2/debian/ebview.1 @@ -0,0 +1,80 @@ +.\" This -*- nroff -*- file has been generated from +.\" DocBook SGML with docbook-to-man on Debian GNU/Linux. +...\" +...\" transcript compatibility for postscript use. +...\" +...\" synopsis: .P! +...\" +.de P! +\\&. +.fl \" force out current output buffer +\\!%PB +\\!/showpage{}def +...\" the following is from Ken Flowers -- it prevents dictionary overflows +\\!/tempdict 200 dict def tempdict begin +.fl \" prolog +.sy cat \\$1\" bring in postscript file +...\" the following line matches the tempdict above +\\!end % tempdict % +\\!PE +\\!. +.sp \\$2u \" move below the image +.. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 +.. +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow +.. +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +'\" t +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +.TH "EBVIEW" "1" +.SH "NAME" +ebview \(em An EPWING CD-ROM dictionary viewer +.SH "SYNOPSIS" +.PP +\fBebview\fP [\fB-e \fIthis\fP\fP] [\fB--example \fIthat\fP\fP] +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBebview\fP commands. +.PP +This manual page was written for the \fBDebian\fP distribution +because the original program does not have a manual page. +.PP +\fBebview\fP is a program that... +.PP +\fBebview\fP is an EPWING CD-ROM +dictionary viewer using libeb. It uses libeb and supports +EPWING format. It can read multiple dictionary at same time and +can search words on X11 cut-buffer automatically. +.SH "AUTHOR" +.PP +This manual page was written by Masayuki Hatta mhatta@debian.org for +the \fBDebian\fP system (but may be used by others). +...\" created by instant / docbook-to-man, Sat 24 May 2003, 17:22 --- ebview-0.3.6.2.orig/debian/control +++ ebview-0.3.6.2/debian/control @@ -0,0 +1,16 @@ +Source: ebview +Section: text +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Masayuki Hatta (mhatta) +Build-Depends: cdbs, debhelper (>= 7), autotools-dev, quilt, libeb16-dev, libgtk2.0-dev +Standards-Version: 3.8.2 +Homepage: http://ebview.sourceforge.net/ + +Package: ebview +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: edict-fpw +Description: EPWING dictionary viewer + This tool can read multiple dictionaries at the same time and + provides a search facility supporting the X11 cut-and-paste buffer. --- ebview-0.3.6.2.orig/debian/docs +++ ebview-0.3.6.2/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- ebview-0.3.6.2.orig/debian/dirs +++ ebview-0.3.6.2/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/applications +usr/share/pixmaps + --- ebview-0.3.6.2.orig/debian/patches/series +++ ebview-0.3.6.2/debian/patches/series @@ -0,0 +1,3 @@ +fix-string-format-error.patch +dont-use-pangox.patch +link-ebview.diff --- ebview-0.3.6.2.orig/debian/patches/link-ebview.diff +++ ebview-0.3.6.2/debian/patches/link-ebview.diff @@ -0,0 +1,26 @@ +Index: b/src/Makefile.am +=================================================================== +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,7 +5,7 @@ + AM_CFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall + AM_CXXFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ + ebview_LDADD = @PANGOX_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \ +- @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@ ++ @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@ -lX11 + ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@ + + ebview_SOURCES = \ +Index: b/src/Makefile.in +=================================================================== +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -243,7 +243,7 @@ + AM_CFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall + AM_CXXFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ + ebview_LDADD = @PANGO_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \ +- @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@ ++ @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@ -lX11 + + ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@ + ebview_SOURCES = \ --- ebview-0.3.6.2.orig/debian/patches/fix-string-format-error.patch +++ ebview-0.3.6.2/debian/patches/fix-string-format-error.patch @@ -0,0 +1,18 @@ +--- a/src/dialog.c ++++ b/src/dialog.c +@@ -69,6 +69,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT /* | GTK_DIALOG_NO_SEPARATOR */, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, ++ "%s", + g_message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +@@ -98,6 +99,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT /* | GTK_DIALOG_NO_SEPARATOR */, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, ++ "%s", + g_message); + + gtk_dialog_run(GTK_DIALOG(dialog)); --- ebview-0.3.6.2.orig/debian/patches/dont-use-pangox.patch +++ ebview-0.3.6.2/debian/patches/dont-use-pangox.patch @@ -0,0 +1,217 @@ +Description: Don't check for pangox, it's not needed. +Bug-Debian: +Author: Emilio Pozuelo Monfort + +--- a/configure ++++ b/configure +@@ -782,8 +782,8 @@ + build_cpu + build + LIBTOOL +-PANGOX_LIBS +-PANGOX_CFLAGS ++PANGO_LIBS ++PANGO_CFLAGS + GTK_LIBS + GTK_CFLAGS + PKG_CONFIG +@@ -909,8 +909,8 @@ + PKG_CONFIG + GTK_CFLAGS + GTK_LIBS +-PANGOX_CFLAGS +-PANGOX_LIBS ++PANGO_CFLAGS ++PANGO_LIBS + XMKMF' + + +@@ -1564,9 +1564,9 @@ + PKG_CONFIG path to pkg-config utility + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config +- PANGOX_CFLAGS +- C compiler flags for PANGOX, overriding pkg-config +- PANGOX_LIBS linker flags for PANGOX, overriding pkg-config ++ PANGO_CFLAGS ++ C compiler flags for PANGO, overriding pkg-config ++ PANGO_LIBS linker flags for PANGO, overriding pkg-config + XMKMF Path to xmkmf, Makefile generator for X Window System + + Use these variables to override the choices made by `configure' or to help +@@ -5862,20 +5862,20 @@ + + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOX" >&5 +-$as_echo_n "checking for PANGOX... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5 ++$as_echo_n "checking for PANGO... " >&6; } + + if test -n "$PKG_CONFIG"; then +- if test -n "$PANGOX_CFLAGS"; then +- pkg_cv_PANGOX_CFLAGS="$PANGOX_CFLAGS" ++ if test -n "$PANGO_CFLAGS"; then ++ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangox\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "pangox") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "pango") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox" 2>/dev/null` ++ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5884,16 +5884,16 @@ + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then +- if test -n "$PANGOX_LIBS"; then +- pkg_cv_PANGOX_LIBS="$PANGOX_LIBS" ++ if test -n "$PANGO_LIBS"; then ++ pkg_cv_PANGO_LIBS="$PANGO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangox\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "pangox") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "pango") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_PANGOX_LIBS=`$PKG_CONFIG --libs "pangox" 2>/dev/null` ++ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5912,22 +5912,22 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PANGOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangox"` ++ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango"` + else +- PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"` ++ PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango"` + fi + # Put the nasty error message in config.log where it belongs +- echo "$PANGOX_PKG_ERRORS" >&5 ++ echo "$PANGO_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (pangox) were not met: ++ as_fn_error "Package requirements (pango) were not met: + +-$PANGOX_PKG_ERRORS ++$PANGO_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-Alternatively, you may set the environment variables PANGOX_CFLAGS +-and PANGOX_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables PANGO_CFLAGS ++and PANGO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " "$LINENO" 5 + elif test $pkg_failed = untried; then +@@ -5937,15 +5937,15 @@ + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + +-Alternatively, you may set the environment variables PANGOX_CFLAGS +-and PANGOX_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables PANGO_CFLAGS ++and PANGO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + + To get pkg-config, see . + See \`config.log' for more details." "$LINENO" 5; } + else +- PANGOX_CFLAGS=$pkg_cv_PANGOX_CFLAGS +- PANGOX_LIBS=$pkg_cv_PANGOX_LIBS ++ PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS ++ PANGO_LIBS=$pkg_cv_PANGO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : +--- a/src/preference.c ++++ b/src/preference.c +@@ -24,11 +24,7 @@ + #include + #endif + +-#ifdef __WIN32__ +-#include +-#else +-#include +-#endif ++#include + + #include "dictbar.h" + #include "selection.h" +@@ -420,30 +416,18 @@ + desc = pango_font_description_from_string(fontset_normal); + lang = pango_language_from_string("ja"); + +-#ifdef __WIN32__ +- fontmap = pango_win32_font_map_for_display(); +-#else +- display = gdk_x11_drawable_get_xdisplay(main_window->window); +- if(display == NULL){ +- LOG(LOG_INFO, "display == NULL"); ++ context = gtk_widget_get_pango_context(main_window); ++ if(context == NULL){ ++ LOG(LOG_INFO, "context == NULL"); + return; + } + +- fontmap = pango_x_font_map_for_display(display); +-#endif +- ++ fontmap = pango_context_get_font_map (context); + if(fontmap == NULL){ + LOG(LOG_INFO, "fontmap == NULL"); + return; + } + +- +- context = gtk_widget_get_pango_context(main_window); +- if(context == NULL){ +- LOG(LOG_INFO, "context == NULL"); +- return; +- } +- + fontset = pango_font_map_load_fontset(fontmap, + context, + desc, +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -166,8 +166,8 @@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ +-PANGOX_CFLAGS = @PANGOX_CFLAGS@ +-PANGOX_LIBS = @PANGOX_LIBS@ ++PANGO_CFLAGS = @PANGO_CFLAGS@ ++PANGO_LIBS = @PANGO_LIBS@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ + POFILES = @POFILES@ +@@ -240,9 +240,9 @@ + AM_CPPFLAGS = @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \ + @EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@ + +-AM_CFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall +-AM_CXXFLAGS = @PANGOX_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ +-ebview_LDADD = @PANGOX_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \ ++AM_CFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ @CYGWIN_CFLAGS@ -Wall ++AM_CXXFLAGS = @PANGO_CFLAGS@ @GTK_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ ++ebview_LDADD = @PANGO_LIBS@ @GTK_LIBS@ @THREAD_LIBS@ @CYGWIN_CFLAGS@ \ + @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ @RES_FILE@ @EXTRA_LIBS@ + + ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@