diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-05-21 15:36:12 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-05-21 15:36:12 +0000 |
| commit | f039ebaccbc2ad4d239f01e695680bf79e5eba58 (patch) | |
| tree | 65174638e1996cdfa0a0f6f797483ce132337c3d /chinese/gcin-qt5 | |
| parent | 0215275bb80478b0d0ebb815d7af360ecdab4ec6 (diff) | |
| download | ports-f039ebaccbc2ad4d239f01e695680bf79e5eba58.tar.gz ports-f039ebaccbc2ad4d239f01e695680bf79e5eba58.zip | |
Update to 2.8.6.
Notes
Notes:
svn path=/head/; revision=470554
Diffstat (limited to 'chinese/gcin-qt5')
| -rw-r--r-- | chinese/gcin-qt5/Makefile | 4 | ||||
| -rw-r--r-- | chinese/gcin-qt5/distinfo | 6 | ||||
| -rw-r--r-- | chinese/gcin-qt5/files/patch-Makefile | 29 |
3 files changed, 19 insertions, 20 deletions
diff --git a/chinese/gcin-qt5/Makefile b/chinese/gcin-qt5/Makefile index e645bcd07deb..a42ed845cd36 100644 --- a/chinese/gcin-qt5/Makefile +++ b/chinese/gcin-qt5/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcin -PORTVERSION= 2.8.5 +PORTVERSION= 2.8.6 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ PKGNAMESUFFIX= -qt5 @@ -22,7 +22,7 @@ USE_CXXSTD= c++11 MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ MKDIR="${MKDIR}" -PLIST_FILES= %%QT_PLUGINDIR%%/platforminputcontexts/libgcinplatforminputcontextplugin.so +PLIST_FILES= ${QT_PLUGINDIR}/platforminputcontexts/libgcinplatforminputcontextplugin.so post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g; \ diff --git a/chinese/gcin-qt5/distinfo b/chinese/gcin-qt5/distinfo index 69f02736f38c..4f08266f1cd1 100644 --- a/chinese/gcin-qt5/distinfo +++ b/chinese/gcin-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488877345 -SHA256 (gcin-2.8.5.tar.xz) = 7a191f71136496e407b2554dd5b8775ebfde4389a37c8a4f3e153485760de93b -SIZE (gcin-2.8.5.tar.xz) = 4005548 +TIMESTAMP = 1526913930 +SHA256 (gcin-2.8.6.tar.xz) = b23432e6e60da45c129d53a0f503488b7933c7954ad5c65711b740c68c7afce0 +SIZE (gcin-2.8.6.tar.xz) = 4035688 diff --git a/chinese/gcin-qt5/files/patch-Makefile b/chinese/gcin-qt5/files/patch-Makefile index f72df61ab4d1..640aec4c20b5 100644 --- a/chinese/gcin-qt5/files/patch-Makefile +++ b/chinese/gcin-qt5/files/patch-Makefile @@ -1,34 +1,34 @@ ---- Makefile.orig 2015-10-17 02:08:40 UTC +--- Makefile.orig 2018-05-12 11:25:26 UTC +++ Makefile -@@ -1,18 +1,20 @@ +@@ -1,19 +1,22 @@ -include ../config.mak +#include ../config.mak -+prefix=/usr/local ++prefix=%%PREFIX%% +libdir=$(prefix)/lib QT=qt5 -+QT5_MOC=/usr/local/lib/qt5/bin/moc ++QT5_MOC=$(prefix)/lib/qt5/bin/moc QTIM=$(QT)/plugins/platforminputcontexts -IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM) +IMMODULES=$(libdir)/$(QTIM) --INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags` -+INCS=-I../im-client -I$(prefix)/include -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` +-INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui --cflags` ++INCS=-I../im-client -I$(prefix)/include/X11 -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui --cflags` MODVERSION=`pkg-config --modversion Qt5Gui` - QTINC=`pkg-config --variable=includedir Qt5Gui` --INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui --#INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -+INCS+=-I$(QTINC)/QtGui/$(MODVERSION) -I$(QTINC)/QtGui/$(MODVERSION)/QtGui -I$(QTINC)/QtCore/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Core`/QtCore/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION)/QtGui + #INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" -+CXXFLAGS+=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" ++CXXFLAGS=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" OBJS= moc_gcin-qt5.o gcin-qt5.o gcin-imcontext-qt5.o moc_qgcinplatforminputcontext.o .SUFFIXES: .c .cpp .a .so .E .h --LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport --libs` +-LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui --libs` +LDFLAGS=-L$(prefix)/lib -L$(prefix)/lib/gcin -lgcin-im-client `pkg-config Qt5Core Qt5Gui --libs` GCIN_QT5 = libgcinplatforminputcontextplugin.so -@@ -32,17 +34,13 @@ $(GCIN_QT5): $(OBJS) +@@ -33,17 +36,11 @@ $(GCIN_QT5): $(OBJS) $(CXX) $(gcc_ld_run_path) -fno-exceptions -shared -o $@ $(OBJS) $(LDFLAGS) rm -f core.* install: @@ -47,6 +47,5 @@ .depend: $(CXX) $(CXXFLAGS) -MM *.cpp > $@ - +- -include .depend -+#include .depend |