kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

irc/kvirc: update to 5.0.0-beta1

Browse source 
- KDE4 will be removed by the end of the year
- Give maintainership to kde@
- Remove irc/kvirc-qt4
This commit is contained in:
Tobias C. Berner 2018-12-22 21:48:45 +00:00
parent f46d7eaf87
commit 5c29daf348
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=488136
9 changed files with 2217 additions and 2314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -10920,3 +10920,4 @@ devel/glib12||2018-12-21|Has expired: Obsolete
graphics/gdk-pixbuf||2018-12-21|Has expired: Uses obsolete glib12
x11-toolkits/gtk12||2018-12-21|Has expired: Uses obsolete glib12
multimedia/gstreamer-plugins-buzztard||2018-12-22|Has expired: Unused in the ports tree and unmaintained upstream
irc/kvirc-qt4||2018-12-22|Has expired: switched to KF5 version

1
irc/Makefile
View file

@ -60,7 +60,6 @@
SUBDIR += keitairc2
SUBDIR += konversation
SUBDIR += kvirc
SUBDIR += kvirc-qt4
SUBDIR += libircclient
SUBDIR += lostirc
SUBDIR += miau

8
irc/kvirc-qt4/Makefile
View file

@ -1,8 +0,0 @@
# $FreeBSD$
PKGNAMESUFFIX= -qt4
COMMENT= Qt 4 based IRC client
MASTERDIR= ${.CURDIR}/../kvirc
.include "${MASTERDIR}/Makefile"

100
irc/kvirc/Makefile
View file

@ -1,95 +1,31 @@
# Created by: Michael Ranner
# $FreeBSD$
PORTNAME= kvirc
PORTVERSION= 4.2.0
PORTREVISION= 8
PORTNAME= KVIrc
DISTVERSION= 5.0.0-beta1
CATEGORIES= irc kde
MASTER_SITES= ftp://ftp.kvirc.de/pub/kvirc/%SUBDIR%/ \
http://kvirc.gmake.de/pub/kvirc/%SUBDIR%/ \
http://kvirc-ftp.visualscripts.com/%SUBDIR%/ \
ftp://dedimarbo.ath.cx/pub/kvirc/%SUBDIR%/ \
ftp://kvirc.eban-meban.com/%SUBDIR%/ \
http://kvirc.tradebit.com/%SUBDIR%/ \
http://kvirc.imsam.info/%SUBDIR%/ \
http://kvirc.bcoos.net/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION}/source
MAINTAINER= ports@FreeBSD.org
COMMENT?= IRC client for KDE 4
MAINTAINER= kde@FreeBSD.org
COMMENT= IRC client for KDE
DEPRECATED= Qt4 has been EOL since december 2015
EXPIRATION_DATE= 2019-03-15
LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \
libenchant.so:textproc/enchant
USES= cmake cpe desktop-file-utils gettext gnome kde:5 perl5 \
pkgconfig python qt:5 ssl tar:bzip2
USE_GNOME= glib20
USE_PERL5= build
USE_QT= moc_build qmake_build rcc_build uic_build \
dbus gui network sql xml
USES= cmake cpe gettext perl5 qt:4 ssl tar:bzip2
CMAKE_ARGS= -DWANT_ESD=no -DWANT_DOXYGEN=no \
-DMANDIR=${MANPREFIX}
USE_KDE= auth codecs config configwidgets coreaddons i18n notifications \
service widgetsaddons windowsystem xmlgui
USE_QT= core dbus gui multimedia network phonon4 printsupport sql svg \
webkit widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xrender xscrnsaver
USE_LDCONFIG= yes
USE_GITHUB= yes
OPTIONS_DEFINE= AUDIOFILE GSM PERL PYTHON DEBUG
OPTIONS_SUB= yes
CMAKE_ARGS= -DMANDIR:STRING=man
AUDIOFILE_DESC= Support for various audio formats
AUDIOFILE_LIB_DEPENDS= libaudiofile.so:audio/libaudiofile
AUDIOFILE_CMAKE_OFF= -DWITHOUT_AUDIOFILE=yes
GSM_DESC= u-law to gsm audio converter support
GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CMAKE_OFF= -DWANT_GSM=no
PERL_DESC= Perl scripting support
PERL_USE= PERL5=run
PERL_CMAKE_OFF= -DWANT_PERL=no
PYTHON_DESC= Python scripting support
PYTHON_USES= python
PYTHON_CMAKE_OFF= -DWANT_PYTHON=no
DEBUG_CMAKE_ON= -DWITH_DEBUG=yes -DVERBOSE=yes
.if defined(PKGNAMESUFFIX)
CONFLICTS_INSTALL= kvirc-4.*
CMAKE_ARGS+= -DWITHOUT_KDE4=yes
PLIST_SUB+= QT="" KDE="@comment "
OPTIONS_DEFINE+= PHONON WEBKIT
PHONON_DESC= Build with Phonon support
PHONON_USES= qt:4
PHONON_USE= QT=phonon
PHONON_CMAKE_OFF= -DWITHOUT_PHONON=yes
WEBKIT_DESC= Build with QtWebkit support
WEBKIT_USES= qt:4
WEBKIT_USE= QT=webkit
WEBKIT_CMAKE_OFF= -DWITHOUT_QTWEBKIT=yes
.else #defined(PKGNAMESUFFIX)
CONFLICTS_INSTALL= kvirc-qt4-4.*
USES+= kde:4 shared-mime-info
USE_KDE= kdelibs automoc4
PLIST_SUB+= QT="@comment " KDE=""
.endif #defined(PKGNAMESUFFIX)
PLIST_SUB+= VER="${PORTVERSION:R}"
pre-fetch-PERL-on:
@${ECHO_CMD} "====================================================="
@${ECHO_CMD} " Perl scripting requires perl with multiplicity"
@${ECHO_CMD} " support (enabled in ports by default)."
@${ECHO_CMD} "====================================================="
post-patch:
${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
${WRKSRC}/CMakeLists.txt
# Fix error: invalid suffix on literal; C++11 requires a space between literal and identifier
${REINPLACE_CMD} -e 's|"KVI_OPTIONS_WIDGET_KEYWORDS|" KVI_OPTIONS_WIDGET_KEYWORDS|g' \
${WRKSRC}/src/modules/options/OptionsInstanceManager.cpp
${REINPLACE_CMD} -e 's|"KVI_PATH_SEPARATOR|" KVI_PATH_SEPARATOR|g' \
${WRKSRC}/src/kvirc/kernel/KviApplication_filesystem.cpp
PLIST_SUB= VER=4.9
.include <bsd.port.mk>

5
irc/kvirc/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (kvirc-4.2.0.tar.bz2) = 9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb
SIZE (kvirc-4.2.0.tar.bz2) = 5461587
TIMESTAMP = 1545499618
SHA256 (KVIrc-KVIrc-5.0.0-beta1_GH0.tar.gz) = 73083c11758b6cd40c4eaed3df7b4a6148bdf4617ddc804a78b636f26ed727bf
SIZE (KVIrc-KVIrc-5.0.0-beta1_GH0.tar.gz) = 6030807

30
irc/kvirc/files/patch-debian_git-5d45ef
View file

@ -1,30 +0,0 @@
Description: Fixes FTBFS with gcc 6.
Fixes invalid conversion errors. Also fixes two wrong flag operations, already
fixed upstream (in 0d14434b and 934fa2e1).
Author: Andrey Rahmatullin <wrar@debian.org>
Bug-Debian: https://bugs.debian.org/811908
Last-Update: 2016-11-04
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index f925ca7..1266b46 100644
--- src/kvirc/kernel/KviIrcConnection.cpp
+++ src/kvirc/kernel/KviIrcConnection.cpp
@@ -669,7 +669,8 @@ void KviIrcConnection::closeAllChannels()
while(m_pChannelList->first())
{
m_pChannelList->first()->close();
- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
+ QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ QApplication::processEvents(f);
}
}
@@ -678,7 +679,8 @@ void KviIrcConnection::closeAllQueries()
while(m_pQueryList->first())
{
m_pQueryList->first()->close();
- QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
+ QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ QApplication::processEvents(f);
}
}

11
irc/kvirc/files/patch-src__kvirc__CMakeLists.txt
View file

@ -1,11 +0,0 @@
--- ./src/kvirc/CMakeLists.txt.orig 2012-05-07 08:17:17.000000000 +0000
+++ ./src/kvirc/CMakeLists.txt 2013-11-21 18:21:55.137647449 +0000
@@ -357,7 +357,7 @@
SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}")
IF(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
- SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -export-dynamic)
+ SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -Wl,-export-dynamic)
MESSAGE(STATUS "Patching for FreeBSD...")
ENDIF()

20
irc/kvirc/files/patch-src_modules_rijndael_libkvirijndael.cpp
View file

@ -1,20 +0,0 @@
--- src/modules/rijndael/libkvirijndael.cpp.orig 2011-07-23 15:15:56 UTC
+++ src/modules/rijndael/libkvirijndael.cpp
@@ -328,7 +328,7 @@
setLastError(__tr2qs("The message is not a hexadecimal string: this is not my stuff"));
return false;
} else {
- if(len > 0)
+ if(*len > 0)
{
*outBuffer = (char *)KviMemory::allocate(*len);
KviMemory::move(*outBuffer,tmpBuf,*len);
@@ -354,7 +354,7 @@
setLastError(__tr2qs("The message is not a base64 string: this is not my stuff"));
return false;
} else {
- if(len > 0)
+ if(*len > 0)
{
*outBuffer = (char *)KviMemory::allocate(*len);
KviMemory::move(*outBuffer,tmpBuf,*len);

4355
irc/kvirc/pkg-plist
View file

File diff suppressed because it is too large Load diff