head 1.13; access; symbols pkgsrc-2017Q3:1.12.0.66 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.62 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.60 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.58 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.56 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.54 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.52 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.50 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.48 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.46 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.44 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.42 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.40 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.38 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.36 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.34 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.32 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.30 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.28 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.26 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.24 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.22 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.20 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.18 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.16 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.14 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.12 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.10 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.8 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.6 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.4 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.2 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.11.0.10 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.8 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.6 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.4 pkgsrc-2008Q2-base:1.11 pkgsrc-2008Q1:1.11.0.2 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.10.0.2 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.9.0.4 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.2 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.8.0.2 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.7.0.6 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.4 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.6.0.16 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.14 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.12 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.10 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.8 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2017.09.26.10.27.21; author wiz; state dead; branches; next 1.12; commitid 9ARpkXTuh9Wg2H8A; 1.12 date 2009.10.23.07.46.08; author tnn; state Exp; branches; next 1.11; 1.11 date 2008.02.20.09.49.56; author markd; state dead; branches; next 1.10; 1.10 date 2007.10.20.10.36.15; author markd; state Exp; branches; next 1.9; 1.9 date 2007.05.23.12.57.46; author markd; state dead; branches; next 1.8; 1.8 date 2007.02.05.19.32.18; author markd; state Exp; branches; next 1.7; 1.7 date 2006.06.01.13.39.10; author markd; state dead; branches; next 1.6; 1.6 date 2004.04.26.11.24.15; author markd; state Exp; branches; next 1.5; 1.5 date 2004.02.04.13.58.39; author markd; state dead; branches; next 1.4; 1.4 date 2004.01.15.09.52.51; author markd; state Exp; branches; next 1.3; 1.3 date 2003.03.11.13.10.34; author markd; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.51; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.44; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.44; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.44; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.12; author jlam; state Exp; branches; next ; desc @@ 1.13 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-af,v 1.12 2009/10/23 07:46:08 tnn Exp $ --- kio/kio/kdirwatch.cpp.orig 2006-07-22 10:16:37.000000000 +0200 +++ kio/kio/kdirwatch.cpp @@@@ -71,6 +71,7 @@@@ #include // Linux kernel headers are documented to not compile #define _S390_BITOPS_H +#define _ASM_GENERIC_FCNTL_H #include static inline int inotify_init (void) @ 1.12 log @Add kludge to let it build on debian squeeze, where it failed with: /usr/include/asm-generic/fcntl.h:117: error: redefinition of 'struct flock' /usr/include/bits/fcntl.h:159: error: previous definition of 'struct flock' (this is due to kdelibs including kernel headers for inotify) Fingers crossed that this won't introduce regressions on $otherLinux. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update to kde 3.5.9 minor bugfixes. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.10 2007/10/20 10:36:15 markd Exp $ d3 8 a10 5 SVN commit 724472 --- kdecore/kstartupinfo.cpp.orig 2007-10-08 22:51:55.000000000 +1300 +++ kdecore/kstartupinfo.cpp @@@@ -545,7 +545,7 @@@@ void KStartupInfo::handleAutoAppStartedS d12 1 a12 38 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 @@@@ QCString KStartupInfo::createNewStartupI #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 @@@@ unsigned long KStartupInfoId::timestamp( 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 @@@@ unsigned long KStartupInfoId::timestamp( 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; } @ 1.10 log @Update to KDE 3.5.8 core libs * Small performance improvements. * Reworked KCmdLineArgs::makeURL to make "kpdf a:b" work when a:b is an existing file in the current directory. * Be more robust against addressbar spoofing. * A hostname may resolve to multiple addresses. When connection to one timeouts, we should not immediately give up. Instead, we try the other addresses. http ioslave * Fix crash on broken servers. * Fix Connection failed Url Frame Redirection. * Fix session cookies not always accepted. * Fix persistent cookies are treated like session cookies. * Fix a cross-site cookie injection vulnerability. * Fix for correctly propagating HTTP response headers > 8K. * Fix http responses containing just a header cause Konqueror to wait indefinitely for a response. * Fix problem with cookies in konqueror when server specified as IP adress. * Fix per-site cookie policy does not apply to cookies set for subdomains. KHTML * Fix handling of font-variant:inherit. * Fix GMail/Firefox yet again. * Fix confused cursor shapes if mail and new-window links appear on the same page. * Fix cannot type text into boxes on riteaid.com. * Optimize descendant selector matching. * Fix invalid placing of image. * Default to "UTF-8" per section 2 of the draft W3C "The XMLHttpRequest Object" specification. kjs * Do not convert accented latin1 characters into undrawable char in websites using advanced JavaScript. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update to KDE 3.5.7 KHTML * Implement heuristic cyr encoding detection. * Implement support for textContent(). * Indicate near mouse pointer if a link wants to open a new browser window. * Harmonize document.href and .pathname of about:blank windows with other browsers. * Fix jumping to the top right before loading a new page. * Make frame name lookup locale-independant. * Make valueOf() and toString() accessible across sites. * Make setValue() work on radio button and checkboxes. * overrideMimeType() implementation. * Fix various crashes and bugs. KJS * Support named function expressions. * Support for localeCompare() function. * Caller property implementation. * Improvements: * Unreserve class keyword as it's often used as an identifier by JS programmers. * Disable UTF-8 validation in libPCRE, since it's incredibly slow. * Support unicode escape sequences in identifier names. * Parse null characters. * toExponential() fix for negative numbers. * Fixed off-by-one digit error in toFixed(). Kate * Update cmake highlighter. * Fix bug in search and replace, placeholder did not work correctly. * Make cursor in inactive views behave correctly. * Update selection after paste. * Multiple views are usable again. Kimgio * Fix buffer overflow during writing xview files. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.8 2007/02/05 19:32:18 markd Exp $ d3 1 a3 1 kde svn 628618 d5 3 a7 3 --- khtml/html/html_documentimpl.cpp.orig 2007-02-04 10:47:21.000000000 +1300 +++ khtml/html/html_documentimpl.cpp @@@@ -222,7 +222,7 @@@@ ElementImpl *HTMLDocumentImpl::createEle d9 38 a46 7 void HTMLDocumentImpl::slotHistoryChanged() { - if ( !m_render ) + if ( true || !m_render ) return; recalcStyle( Force ); @ 1.8 log @Reverting r617941. This fixes jumping to the top right before loading a new page in konqueror and also fixes page loading time increase. From KDE SVN. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to KDE 3.5.3 Changes: * KHTML o Don't crash when triple-clicking on a line that has :after or :before content, or anything that isn't in the DOM o Implement nondeterministic CSS matching o Do not crash if an old target got destroyed. o Fix static Y position of positioned objects in initial whitespace (3.5 regression). o Fontrendering: A few percent speedup by caching font scalability info o Konqueror will crash if a floated link uses :hover:before or :hover:after to create a positioned element. o Text selection misbehaves for devanagari. o Fix crash when hovering a HTML menu item o Don't crash when null pointer passed to removeEventListener o Prevent an infinite loop in parseToken() when dealing with broken HTML. o If we saved creating a renderer at attach. Create it if we later need it. o Don't allow to find text in password fields. o Improve XHTML CSS styling o Handle CSS restyling for all types of dynamic DOM changes and user interaction o Only repaint the expossed background when scrolling. Optimizes a few slow pages with unoptimized X11 drivers. o Speed-up painting and selections on pages with large tables. o Match better the error-handling capabilities of Firefox with respect to DL/DT/DD elements. o Added missing sanity check which caused crashes in caret mode on pgup/pgdn when there was no valid caret. o Make sure copyBlt doesn't fail because of different depth. o No other property depends on background-image, and applying it before the rest of the background short-hand breaks it under inheritance. * KIO o Add media kioslave support to KFileDialog o KPropertiesDialog first renames the file, then allows all plugins to save their changes. o Make KDirSelectDialog work with media:/ and similar. Fixes JuK. * KDEPrint o Fix usage of private methods in CUPS which broke KDEPrint with CUPS 1.2 o Allow adding multiple file to the to-be-printed list. o No fax sent when special characters are included in the sender information o Kdeprintfax ignores paper size setting when using Hylafax * KDE-UI o Use KConfigGroup to reset the config group automatically. o Give a possibility to disable spellchecking. * KIO-Slaves o KIO-HTTP o Keep the fragment when doing redirections. (the HTTP requests and redirections don't include fragments; it's a browser thing). @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.6 2004/04/26 11:24:15 markd Exp $ d3 5 a7 11 --- kdecore/kmountpoint.cpp.orig 2003-09-21 20:39:00.000000000 +1200 +++ kdecore/kmountpoint.cpp @@@@ -219,7 +219,11 @@@@ KMountPoint::List KMountPoint::currentMo #ifdef HAVE_GETMNTINFO +#ifdef ST_RDONLY + struct statvfs *mounted; +#else struct statfs *mounted; +#endif d9 5 a13 1 int num_fs = getmntinfo(&mounted, MNT_NOWAIT); d15 1 @ 1.6 log @statfs -> statvfs in current. Patch from John R. Shannon in PR 25324 with suggestion from Christos Zoulas @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update to KDE-3.2.0. Changes: Libraries * Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett * Documentation parsing (kdoc based) and inclusion in generated .dcopidl files (note: kdebindings dcopidlng only) Alexander Kellett * Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett * Thumbnail generator for DVI files. Stefan Kebekus * Thumbnail generator for Xcursor files. Fredrik Hoeglund * KMainWindow can now maintain the statusbar and corresponding action (duplicate (99% of the time broken) code removed from countless applications in KDE). Benjamin Meyer * KMainWindow, KToolbar, and several other core classes now will only stores settings if those settings are not the default values (helping to reduce the huge size of config files). Benjamin Meyer * Add support for International Domain Names (IDN). Thiago Macieira, Waldo Bastian * KDE Password Registry and Wallet. George Staikos * SSL session ID reuse. George Staikos * KCookiejar: Support HttpOnly cookies. Waldo Bastian * KLocale: support for different calendar systems Hans Petter Bieker * KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker * Support data urls. See rfc 2397. Leo Savernik * New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner * New KFile permissions panel Tim Jansen * Support for mimetype inheritance and aliases David Faure * KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a KGuiItem instead (deprecating the old methods) Martijn Klingens * Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher * Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog David Faure * Add KSplashScreen, a splash screen class based on QSplashScreen (with support for KDE's Xinerama options) Chris Howells * KPasteTextAction: enhanced action for pasting text by offering a list with the clipboard history. Andras Mantia KHTML * Non-modal find dialog David Faure KDEfx * Added KCPUInfo class which makes it possible for applications to do runtime checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec. Fredrik Hoeglund * Added MMX and SSE2 optimizations to the blending functions in KImageEffect, that among other things are used to blend the translucent menus when the menu effect is set to software blend, and to tint icons when they're selected in icon views. Fredrik Hoeglund Kate Part * File type specific settings Christoph Cullmann * vi style cmd line Christoph Cullmann * Support variable lines in files Anders Lund * Color Schemes Christoph Cullmann * Indentation based code folding Christoph Cullmann * Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces Christoph Cullmann KImgIO * Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images Nadeem Hasan * Add TGA image plugin, supports reading and writing true color TGA images (compressed and uncompressed) Dominik Seichter Interfaces * Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau KSpell * Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin * Completely reworking the spell checking dialog. Adding language selection combo. Zack Rusin @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 2004/01/15 09:52:51 markd Exp $ d3 11 a13 5 --- dcop/Makefile.am.orig 2003-12-17 03:37:17.000000000 +1300 +++ dcop/Makefile.am @@@@ -29,7 +29,7 @@@@ INCLUDES= $(all_includes) bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc d15 1 a15 36 -lib_LTLIBRARIES = libDCOP.la dcopserver.la +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries) @@@@ -41,13 +41,17 @@@@ METASOURCES = AUTO # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp +libdcopserver_main_la_LDFLAGS = $(all_libraries) +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp +libdcopserver_main_la_LIBADD = libDCOP.la + dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) -dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp -dcopserver_la_LIBADD = libDCOP.la +dcopserver_la_SOURCES = dcopserver_main.cpp +dcopserver_la_LIBADD = libdcopserver_main.la dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -dcopserver_SOURCES = dummy.cpp -dcopserver_LDADD = dcopserver.la +dcopserver_SOURCES = dcopserver_main.cpp +dcopserver_LDADD = libdcopserver_main.la dcopserver_shutdown_SOURCES = dcopserver_shutdown.c @@@@ -61,9 +65,6 @@@@ testdcopc_LDADD = KDE-ICE/libkICE.la $( EXTRA_DIST = HOWTO ICE Mainpage.dox -dummy.cpp: - echo > dummy.cpp - DOXYGEN_REFERENCES = kdecore DOXYGEN_EXCLUDE = KDE-ICE @ 1.4 log @Update to KDE-3.1.5 Changes: * networking: Fix crash related to SOCKS * kate: C syntax highlighting * konqueror: Improved handling of long filenames in icon view. * khtml: Minor rendering fixes * khtml: Improved loading of large images * java: Crash fix * webdav: Fixed renaming of files via secure connection @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 2002/08/25 19:23:51 jlam Exp $ d3 1 a3 1 --- dcop/Makefile.am.orig Mon Sep 16 09:12:54 2002 d5 1 a5 1 @@@@ -29,7 +29,7 @@@@ d14 1 a14 1 @@@@ -45,13 +45,17 @@@@ d36 3 a38 2 @@@@ -64,9 +68,6 @@@@ testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) a39 2 EXTRA_DIST = HOWTO ICE - d42 3 a45 2 DOXYGEN_REFERENCES = kdecore DOXYGEN_EXCLUDE = KDE-ICE/* @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1.2.1 2002/06/23 19:06:12 jlam Exp $ d3 1 a3 1 --- dcop/Makefile.am.orig Sun Feb 17 06:36:25 2002 d12 1 a12 1 libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries) d14 1 a14 1 @@@@ -43,13 +43,17 @@@@ d16 1 a16 1 libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp d36 1 a36 1 @@@@ -62,6 +66,3 @@@@ d43 3 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdelibs3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-af was added on branch buildlink2 on 2002-06-23 19:06:12 +0000 @ text @d1 42 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 42 $NetBSD: patch-af,v 1.1.1.1.2.1 2002/06/23 19:06:12 jlam Exp $ --- dcop/Makefile.am.orig Sun Feb 17 06:36:25 2002 +++ dcop/Makefile.am @@@@ -29,7 +29,7 @@@@ bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc -lib_LTLIBRARIES = libDCOP.la dcopserver.la +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries) @@@@ -43,13 +43,17 @@@@ # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp +libdcopserver_main_la_LDFLAGS = $(all_libraries) +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp +libdcopserver_main_la_LIBADD = libDCOP.la + dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) -dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp -dcopserver_la_LIBADD = libDCOP.la +dcopserver_la_SOURCES = dcopserver_main.cpp +dcopserver_la_LIBADD = libdcopserver_main.la dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) -dcopserver_SOURCES = dummy.cpp -dcopserver_LDADD = dcopserver.la +dcopserver_SOURCES = dcopserver_main.cpp +dcopserver_LDADD = libdcopserver_main.la dcopserver_shutdown_SOURCES = dcopserver_shutdown.c @@@@ -62,6 +66,3 @@@@ testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) EXTRA_DIST = HOWTO ICE - -dummy.cpp: - echo > dummy.cpp @