Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Mar 2021 23:45:34 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r568765 - in head/textproc/fcitx5-configtool: . files
Message-ID:  <202103182345.12INjY6N011772@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Thu Mar 18 23:45:34 2021
New Revision: 568765
URL: https://svnweb.freebsd.org/changeset/ports/568765

Log:
  Fix textproc/fcitx5-configtool ahead of KF5 5.80
  
  I'm not sure this is really KF5 related: CMake has gotten
  more conservative with #cmakedefine recently, so it might
  have been missed-fallout in a CMake update previously.
  
  No change to the port except replacing #cmakedefine
  with the correct #define (the CMake variant is for variables
  with boolean type at the CMake level)

Added:
  head/textproc/fcitx5-configtool/files/
  head/textproc/fcitx5-configtool/files/patch-config.h.in   (contents, props changed)
Modified:
  head/textproc/fcitx5-configtool/Makefile

Modified: head/textproc/fcitx5-configtool/Makefile
==============================================================================
--- head/textproc/fcitx5-configtool/Makefile	Thu Mar 18 23:43:39 2021	(r568764)
+++ head/textproc/fcitx5-configtool/Makefile	Thu Mar 18 23:45:34 2021	(r568765)
@@ -3,6 +3,7 @@
 
 PORTNAME=	fcitx5-configtool
 DISTVERSION=	5.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc x11
 
 MAINTAINER=	khng300@gmail.com
@@ -28,7 +29,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	fcitx
 
 USE_KDE=	ecm coreaddons kdeclarative i18n itemviews kirigami2 package widgetsaddons
-USE_QT=		concurrent core gui quickcontrols2 widgets x11extras buildtools_build qmake_build
+USE_QT=		concurrent core dbus declarative gui quickcontrols2 widgets x11extras \
+		buildtools_build qmake_build
 USE_XORG=	x11 xkbfile
 USE_LDCONFIG=	yes
 

Added: head/textproc/fcitx5-configtool/files/patch-config.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/fcitx5-configtool/files/patch-config.h.in	Thu Mar 18 23:45:34 2021	(r568765)
@@ -0,0 +1,19 @@
+--- config.h.in.orig	2021-03-18 23:30:34 UTC
++++ config.h.in
+@@ -6,11 +6,11 @@
+ #ifndef _KCM_FCITX5_CONFIG_H_
+ #define _KCM_FCITX5_CONFIG_H_
+ 
+-#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
+-#cmakedefine XKEYBOARDCONFIG_XKBBASE "@XKEYBOARDCONFIG_XKBBASE@"
+-#cmakedefine ISOCODES_ISO639_2_JSON "@ISOCODES_ISO639_2_JSON@"
+-#cmakedefine ISOCODES_ISO639_3_JSON "@ISOCODES_ISO639_3_JSON@"
+-#cmakedefine ISOCODES_ISO639_5_JSON "@ISOCODES_ISO639_5_JSON@"
++#define PROJECT_VERSION "@PROJECT_VERSION@"
++#define XKEYBOARDCONFIG_XKBBASE "@XKEYBOARDCONFIG_XKBBASE@"
++#define ISOCODES_ISO639_2_JSON "@ISOCODES_ISO639_2_JSON@"
++#define ISOCODES_ISO639_3_JSON "@ISOCODES_ISO639_3_JSON@"
++#define ISOCODES_ISO639_5_JSON "@ISOCODES_ISO639_5_JSON@"
+ 
+ #define FCITX5_QT5_GUI_WRAPPER "@FCITX5_QT5_GUI_WRAPPER@"
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103182345.12INjY6N011772>