aboutsummaryrefslogtreecommitdiffstats
path: root/x11/kdelibs3
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-08-18 17:22:07 +0800
committermiwi <miwi@FreeBSD.org>2008-08-18 17:22:07 +0800
commit05353858b06303f6c9dc7ca0b470a20d736a32b9 (patch)
tree0d493f61a1399e881ba6cff7c098f47951267c9c /x11/kdelibs3
parentef5ec4ff8d54cc22f6cfd2681beab301f9076efc (diff)
downloadfreebsd-ports-gnome-05353858b06303f6c9dc7ca0b470a20d736a32b9.tar.gz
freebsd-ports-gnome-05353858b06303f6c9dc7ca0b470a20d736a32b9.tar.zst
freebsd-ports-gnome-05353858b06303f6c9dc7ca0b470a20d736a32b9.zip
The KDE FreeBSD team is proud to announce the release
of KDE 3.5.9 for FreeBSD. The official KDE 3.5.9 release notes can be found at: http://www.kde.org/announcements/announce-3.5.9.php After the KDE 4.1.0 import the team found time to make KDE 3.5.9 ready for the Ports tree. KDE 3.5.9 was released six months ago and 3.5.10 is coming soon. We are not sure we have time to get 3.5.10 for FreeBSD 7.1/6.4 release, but we would have minimum 3.5.9 for those people who prefer to stay with KDE3. Of course Thanks to all Testers.
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile11
-rw-r--r--x11/kdelibs3/distinfo6
-rw-r--r--x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp42
-rw-r--r--x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp13
-rw-r--r--x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c11
-rw-r--r--x11/kdelibs3/files/patch-kioslave_http-http.cc39
6 files changed, 8 insertions, 114 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 7772d47a51a7..8912d7ef164d 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -30,10 +30,12 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier \
${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
- ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+ iceauth:${PORTSDIR}/x11/iceauth
CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
.if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
@@ -62,8 +64,8 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
--disable-as-needed \
--enable-mt \
--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
- --with-libthai=yes \
--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
+ --with-libthai=yes \
--with-lua=no \
--with-ssl-dir=${OPENSSLBASE}
CONFIGURE_ENV+= libltdl_cv_shlibext=".so"
@@ -79,9 +81,6 @@ FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif # !exists(/usr/bin/bzip2)
-BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS+= iceauth:${PORTSDIR}/x11/iceauth
-
pre-configure:
${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 96d54b9e3d7a..caacbae9e927 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.8.tar.bz2) = acaa37e79e840d10dca326277a20863c
-SHA256 (KDE/kdelibs-3.5.8.tar.bz2) = 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
-SIZE (KDE/kdelibs-3.5.8.tar.bz2) = 15557343
+MD5 (KDE/kdelibs-3.5.9.tar.bz2) = 55e5f00874933d1a7ba7c95e369a205e
+SHA256 (KDE/kdelibs-3.5.9.tar.bz2) = 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
+SIZE (KDE/kdelibs-3.5.9.tar.bz2) = 15568675
diff --git a/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp b/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp
deleted file mode 100644
index 62be701bb371..000000000000
--- a/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdecore/kstartupinfo.cpp 2007/10/08 11:32:36 722993
-+++ kdecore/kstartupinfo.cpp 2007/10/12 12:13:00 724472
-@@ -545,7 +545,7 @@
-
- void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
- {
-- long activate = true;
-+ bool activate = true;
- kapp->setStartupId( startup_id );
- if( window != NULL )
- {
-@@ -937,7 +937,7 @@
- #ifdef Q_WS_X11
- extern Time qt_x_user_time;
- #else
-- long qt_x_user_time = 0;
-+ unsigned long qt_x_user_time = 0;
- #endif
- QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
- .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-@@ -1078,7 +1078,9 @@
- if( pos >= 0 )
- {
- bool ok;
-- long time = d->id.mid( pos + 5 ).toLong( &ok );
-+ unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
-+ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+ time = d->id.mid( pos + 5 ).toLong( &ok );
- if( ok )
- return time;
- }
-@@ -1093,7 +1095,9 @@
- if( pos2 >= 0 )
- {
- bool ok;
-- long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-+ unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
-+ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+ time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
- if( ok )
- return time;
- }
diff --git a/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp b/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp
deleted file mode 100644
index caee9f862c62..000000000000
--- a/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdeui/kactionclasses.cpp 2007/10/08 11:32:36 722993
-+++ kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528
-@@ -667,8 +667,8 @@
- KToolBar* bar = static_cast<KToolBar*>( widget );
- int id_ = KAction::getToolButtonID();
- bar->insertCombo( comboItems(), id_, isEditable(),
-- SIGNAL( activated( int ) ), this,
-- SLOT( slotActivated( int ) ), isEnabled(),
-+ SIGNAL( activated( const QString & ) ), this,
-+ SLOT( slotActivated( const QString & ) ), isEnabled(),
- toolTip(), -1, index );
-
- QComboBox *cb = bar->getCombo( id_ );
diff --git a/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c b/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c
deleted file mode 100644
index 396ca8af4ff2..000000000000
--- a/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kinit/start_kdeinit_wrapper.c.orig 2007-10-29 22:49:04.000000000 +0100
-+++ kinit/start_kdeinit_wrapper.c 2007-10-29 22:49:21.000000000 +0100
-@@ -85,7 +85,7 @@
- if(argc == 0)
- return 1;
- argv[0] = "start_kdeinit";
-- execv("start_kdeinit",argv);
-+ execvp("start_kdeinit",argv);
- perror("start_kdeinit");
- return 1;
- }
diff --git a/x11/kdelibs3/files/patch-kioslave_http-http.cc b/x11/kdelibs3/files/patch-kioslave_http-http.cc
deleted file mode 100644
index 73929be6efcf..000000000000
--- a/x11/kdelibs3/files/patch-kioslave_http-http.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- kioslave/http/http.cc 2007/09/26 17:08:43 717341
-+++ kioslave/http/http.cc 2007/10/17 04:11:51 726097
-@@ -3409,10 +3409,6 @@
-
- } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
-
-- // Send the current response before processing starts or it
-- // might never get sent...
-- forwardHttpResponseHeader();
--
- // Now process the HTTP/1.1 upgrade
- QStringList::Iterator opt = upgradeOffers.begin();
- for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
- mimeType( m_strMimeType );
- }
-
-+ // Do not move send response header before any redirection as it seems
-+ // to screw up some sites. See BR# 150904.
-+ forwardHttpResponseHeader();
-+
- if (m_request.method == HTTP_HEAD)
- return true;
-
-@@ -3830,10 +3830,10 @@
- // Check...
- createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
- if (!m_request.fcache)
-- {
-- m_request.bCachedWrite = false; // Error creating cache entry.
-- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-- }
-+ {
-+ m_request.bCachedWrite = false; // Error creating cache entry.
-+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+ }
- m_request.expireDate = expireDate;
- m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
- }