git: c8470cb1b3d2 - main - irc/dxirc: Update to 1.40.0
Li-Wen Hsu
lwhsu at FreeBSD.org
Tue Sep 28 18:18:35 UTC 2021
The branch main has been updated by lwhsu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c8470cb1b3d20680cb79e42698175d4f38caa9fb
commit c8470cb1b3d20680cb79e42698175d4f38caa9fb
Author: David Vachulka <archdvx at dxsolutions.org>
AuthorDate: 2021-09-28 18:12:59 +0000
Commit: Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-09-28 18:17:24 +0000
irc/dxirc: Update to 1.40.0
Change maintainer email
PR: 258763
---
irc/dxirc/Makefile | 6 ++---
irc/dxirc/distinfo | 6 ++---
irc/dxirc/files/patch-CMakeLists.txt | 8 +++----
irc/dxirc/files/patch-data_CMakeLists.txt | 12 +++++-----
irc/dxirc/files/patch-fox_CMakeLists.txt | 27 ++++++++++++++++-----
irc/dxirc/files/patch-qt_CMakeLists.txt | 39 ++++++++++++++++++++-----------
irc/dxirc/pkg-plist | 9 +++++++
7 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/irc/dxirc/Makefile b/irc/dxirc/Makefile
index ed47905fd44e..f45e93006787 100644
--- a/irc/dxirc/Makefile
+++ b/irc/dxirc/Makefile
@@ -1,10 +1,9 @@
PORTNAME= dxirc
-PORTVERSION= 1.30.0
-PORTREVISION= 3
+PORTVERSION= 1.40.0
CATEGORIES= irc
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
-MAINTAINER= arch_dvx at users.sourceforge.net
+MAINTAINER= archdvx at dxsolutions.org
COMMENT= Simple IRC client
LICENSE= GPLv3+
@@ -42,6 +41,5 @@ NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify
QT5_USES= qt:5
QT5_USE= QT=core,gui,multimedia,network,widgets \
QT=buildtools_build,qmake_build
-QT5_CMAKE_ON= -DQT5:BOOL=ON
.include <bsd.port.mk>
diff --git a/irc/dxirc/distinfo b/irc/dxirc/distinfo
index 7c2e2d9b2705..a2f2d17a7aad 100644
--- a/irc/dxirc/distinfo
+++ b/irc/dxirc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479762158
-SHA256 (dxirc-1.30.0.tar.gz) = 8a98441f8e3ce3a77e5af8f783e439690ac08f7672616a03151b9892e9ff948d
-SIZE (dxirc-1.30.0.tar.gz) = 1300576
+TIMESTAMP = 1632852912
+SHA256 (dxirc-1.40.0.tar.gz) = 15d2fc8c86ef1a91714cb0255db39bf2dda0162d46ff6a8cd2439e44e9041548
+SIZE (dxirc-1.40.0.tar.gz) = 1343202
diff --git a/irc/dxirc/files/patch-CMakeLists.txt b/irc/dxirc/files/patch-CMakeLists.txt
index 01c7c39815a5..9a7a785c64f0 100644
--- a/irc/dxirc/files/patch-CMakeLists.txt
+++ b/irc/dxirc/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
---- CMakeLists.txt.orig 2015-10-28 18:53:26 UTC
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -5,13 +5,17 @@ set(PROJECT_VERSION "1.30.0")
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+@@ -22,13 +22,17 @@
+ endif()
find_package(PkgConfig)
-find_package(Libintl)
@@ -22,7 +22,7 @@
if(NOT WIN32)
option(HAVE_ENCHANT "Enable spellchecking" FALSE)
-@@ -23,11 +27,14 @@ if(APPLE)
+@@ -40,11 +40,14 @@
option(ENABLE_OSX_BUNDLE "Package dxirc as an OSX bundle (ignored on other platforms)." OFF)
endif(APPLE)
diff --git a/irc/dxirc/files/patch-data_CMakeLists.txt b/irc/dxirc/files/patch-data_CMakeLists.txt
index bed37f9e7889..8fd88abe113b 100644
--- a/irc/dxirc/files/patch-data_CMakeLists.txt
+++ b/irc/dxirc/files/patch-data_CMakeLists.txt
@@ -1,12 +1,12 @@
---- data/CMakeLists.txt.orig 2015-10-28 18:53:26 UTC
+--- data/CMakeLists.txt.orig
+++ data/CMakeLists.txt
-@@ -1,9 +1,16 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
+@@ -1,7 +1,14 @@
+-add_subdirectory(translations)
+-
+if(WITH_NLS)
- add_subdirectory(translations)
++ add_subdirectory(translations)
+endif(WITH_NLS)
-
++
if(NOT WIN32)
-install(FILES dxirc-fox.desktop dxirc-qt.desktop DESTINATION share/applications)
+ if(BUILD_FOX)
diff --git a/irc/dxirc/files/patch-fox_CMakeLists.txt b/irc/dxirc/files/patch-fox_CMakeLists.txt
index d4a297adad02..3679dfccbb9c 100644
--- a/irc/dxirc/files/patch-fox_CMakeLists.txt
+++ b/irc/dxirc/files/patch-fox_CMakeLists.txt
@@ -1,6 +1,6 @@
--- fox/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC
+++ fox/CMakeLists.txt
-@@ -20,8 +20,17 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_C
+@@ -16,8 +16,17 @@
if(PKG_CONFIG_FOUND)
pkg_check_modules(FOX fox)
@@ -20,7 +20,7 @@
endif(PKG_CONFIG_FOUND)
if(NOT FOX_FOUND)
-@@ -47,16 +56,14 @@ endif()
+@@ -43,16 +52,14 @@
set(HAVE_X11 FALSE)
if(NOT WIN32)
@@ -39,12 +39,14 @@
else(NOT WIN32)
list(APPEND DXIRCFOX_LIBS "ws2_32" "winmm")
endif(NOT WIN32)
-@@ -89,8 +96,17 @@ endif(HAVE_LUA)
- if(HAVE_ENCHANT)
+@@ -86,21 +93,21 @@
+ set(HAVE_ENCHANT2 FALSE)
+ if(USE_ENCHANT)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(ENCHANT enchant)
+- pkg_check_modules(ENCHANT enchant-2)
- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
++ pkg_check_modules(ENCHANT enchant)
+ find_path(ENCHANT_INCLUDE_DIR enchant++.h
+ PATHS
+ ${ENCHANT_INCLUDE_DIRS}
@@ -56,6 +58,19 @@
+ /usr/local/lib)
+ list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})
+ list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
+ set(HAVE_ENCHANT TRUE)
+ if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+ set(HAVE_ENCHANT2 TRUE)
+- endif()
+- if(NOT ENCHANT_FOUND)
+- pkg_check_modules(ENCHANT enchant)
+- list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
+- list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+- set(HAVE_ENCHANT TRUE)
+- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+- set(HAVE_ENCHANT2 TRUE)
+- endif()
+ endif()
endif(PKG_CONFIG_FOUND)
if(NOT ENCHANT_FOUND)
- set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
+
diff --git a/irc/dxirc/files/patch-qt_CMakeLists.txt b/irc/dxirc/files/patch-qt_CMakeLists.txt
index e4874cb85bc8..04edb42a34b7 100644
--- a/irc/dxirc/files/patch-qt_CMakeLists.txt
+++ b/irc/dxirc/files/patch-qt_CMakeLists.txt
@@ -1,7 +1,7 @@
---- qt/CMakeLists.txt.orig 2015-11-16 14:35:35 UTC
+--- qt/CMakeLists.txt.orig
+++ qt/CMakeLists.txt
-@@ -13,11 +13,11 @@ project(dxirc-qt)
- option(QT5 "Compile with Qt 5" TRUE)
+@@ -5,11 +5,11 @@
+ option(QT6 "Compile with Qt6" FALSE)
if(UNIX)
- if(BSD)
@@ -14,16 +14,26 @@
endif(UNIX)
SET(DXIRCQT_LIBS "")
-@@ -35,11 +35,20 @@ endif(HAVE_LUA)
-
+@@ -30,22 +30,22 @@
if(NOT APPLE)
- if(HAVE_ENCHANT)
-- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(ENCHANT enchant)
+ if(USE_ENCHANT)
+ if(PKG_CONFIG_FOUND)
+- pkg_check_modules(ENCHANT enchant-2)
- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
-- endif(PKG_CONFIG_FOUND)
-+ if(PKG_CONFIG_FOUND)
+- set(HAVE_ENCHANT TRUE)
+- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+- set(HAVE_ENCHANT2 TRUE)
+- endif()
+- if(NOT ENCHANT_FOUND)
+- pkg_check_modules(ENCHANT enchant)
+- list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
+- list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+- set(HAVE_ENCHANT TRUE)
+- if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+- set(HAVE_ENCHANT2 TRUE)
+- endif()
+- endif()
+ pkg_check_modules(ENCHANT enchant)
+ find_path(ENCHANT_INCLUDE_DIR enchant++.h
+ PATHS
@@ -36,11 +46,14 @@
+ /usr/local/lib)
+ list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY})
+ list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
-+ endif(PKG_CONFIG_FOUND)
++ set(HAVE_ENCHANT TRUE)
++ if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
++ set(HAVE_ENCHANT2 TRUE)
++ endif()
+ endif(PKG_CONFIG_FOUND)
if(NOT ENCHANT_FOUND)
set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
- set(ENCHANT_LIBRARY "" CACHE FILEPATH "Filepath to enchant library")
-@@ -110,6 +119,7 @@ dialogs/scriptdialog.h
+@@ -122,6 +122,7 @@
dialogs/dccsenddialog.h
dialogs/configdialog.h
dialogs/keydialog.h
diff --git a/irc/dxirc/pkg-plist b/irc/dxirc/pkg-plist
index fe11a529391b..69486cd1834a 100644
--- a/irc/dxirc/pkg-plist
+++ b/irc/dxirc/pkg-plist
@@ -31,6 +31,15 @@
%%DATADIR%%/icons/dxirc.png
%%DATADIR%%/icons/file.png
%%DATADIR%%/icons/find.png
+%%DATADIR%%/icons/flags/ad.png
+%%DATADIR%%/icons/flags/ae.png
+%%DATADIR%%/icons/flags/af.png
+%%DATADIR%%/icons/flags/ag.png
+%%DATADIR%%/icons/flags/ai.png
+%%DATADIR%%/icons/flags/al.png
+%%DATADIR%%/icons/flags/am.png
+%%DATADIR%%/icons/flags/an.png
+%%DATADIR%%/icons/flags/ao.png
%%DATADIR%%/icons/flags/ar.png
%%DATADIR%%/icons/flags/as.png
%%DATADIR%%/icons/flags/at.png
More information about the dev-commits-ports-main
mailing list