irc/dxirc: Update to 1.40.0

Change maintainer email

PR:		258763

4 files changed, 57 insertions, 29 deletions

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