head 1.13; access; symbols pkgsrc-2017Q3:1.12.0.84 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.80 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.78 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.76 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.74 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.72 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.70 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.68 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.66 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.64 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.62 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.60 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.58 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.56 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.54 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.52 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.50 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.48 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.46 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.44 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.42 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.40 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.38 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.36 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.34 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.32 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.30 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.28 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.26 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.24 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.22 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.20 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.18 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.16 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.14 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.12 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.10 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.8 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.6 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.4 pkgsrc-2008Q1:1.12.0.2 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.10.0.6 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.4 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.2 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.9.0.2 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.8.0.6 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.4 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.2 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 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.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 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 2008.01.31.08.40.51; author markd; state Exp; branches; next 1.11; 1.11 date 2008.01.04.21.05.57; author markd; state Exp; branches; next 1.10; 1.10 date 2007.05.23.13.05.35; author markd; state dead; branches; next 1.9; 1.9 date 2007.01.26.02.49.25; author markd; state Exp; branches; next 1.8; 1.8 date 2006.03.30.02.39.39; author markd; state dead; branches; next 1.7; 1.7 date 2006.01.31.22.25.34; author markd; state Exp; branches; next 1.6; 1.6 date 2004.06.10.11.51.52; author markd; state dead; branches; next 1.5; 1.5 date 2004.05.01.07.32.15; author tron; state Exp; branches; next 1.4; 1.4 date 2004.04.30.01.42.11; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2004.02.04.14.25.58; author markd; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.23.36; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.18.42; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.18.42; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.18.42; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.16; 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-ah,v 1.12 2008/01/31 08:40:51 markd Exp $ --- kicker/applets/naughty/NaughtyProcessMonitor.cpp.orig 2005-10-11 04:03:59.000000000 +1300 +++ kicker/applets/naughty/NaughtyProcessMonitor.cpp @@@@ -20,8 +20,9 @@@@ /* OpenBSD support by Jean-Yves Burlett */ -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include +#include #include #include #include @@@@ -29,6 +30,11 @@@@ #include #endif +#ifdef __NetBSD__ +#include +#include +#endif + #include #include #include @@@@ -67,10 +73,13 @@@@ class NaughtyProcessMonitorPrivate QTimer * timer_; QMap loadMap_; QMap scoreMap_; -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) QMap cacheLoadMap_; QMap uidMap_; #endif +#ifdef __NetBSD__ + kvm_t *kd; +#endif uint oldLoad_; uint triggerLevel_; @@@@ -95,11 +104,17 @@@@ NaughtyProcessMonitor::NaughtyProcessMon d->interval_ = interval * 1000; d->triggerLevel_ = triggerLevel; d->timer_ = new QTimer(this); +#ifdef __NetBSD__ + d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open"); +#endif connect(d->timer_, SIGNAL(timeout()), this, SLOT(slotTimeout())); } NaughtyProcessMonitor::~NaughtyProcessMonitor() { +#ifdef __NetBSD__ + kvm_close(d->kd); +#endif delete d; } @@@@ -219,7 +234,7 @@@@ NaughtyProcessMonitor::canKill(ulong pid // uint d(l[4].toUInt()); return geteuid() == a; -#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__) || defined(__NetBSD__) // simply check if entry exists in the uid map and use it if (!d->uidMap_.contains(pid)) return false ; @@@@ -234,7 +249,7 @@@@ NaughtyProcessMonitor::canKill(ulong pid QString NaughtyProcessMonitor::processName(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) #ifdef __linux__ QFile f("/proc/" + QString::number(pid) + "/cmdline"); @@@@ -283,6 +298,29 @@@@ NaughtyProcessMonitor::processName(ulong QString unicode(QString::fromLocal8Bit(argv[0])); free (argv) ; +#elif defined(__NetBSD__) + struct kinfo_proc2 *p; + int len; + char **argv; + + p = kvm_getproc2(d->kd, KERN_PROC_PID, pid, + sizeof(struct kinfo_proc2), &len); + if (len < 1) { + return i18n("Unknown") ; + } + + // Now strip 'kdeinit:' prefix. + QString unicode(QString::fromLocal8Bit(p->p_comm)); + + if (unicode == "kdeinit") { + argv = kvm_getargv2(d->kd, p, 100); + while (argv != NULL && (*argv == "kdeinit:")) { + argv++; + } + if (argv != NULL) { + unicode = *argv; + } + } #endif QStringList parts(QStringList::split(' ', unicode)); @@@@ -350,6 +388,28 @@@@ NaughtyProcessMonitor::cpuLoad() const d->oldLoad_ = load ; return (forgetThisOne ? 0 : diff); +#elif defined(__NetBSD__) + int mib[2] ; + u_int64_t cp_time[CPUSTATES] ; + size_t size ; + uint load, diff ; + bool forgetThisOne = 0 == d->oldLoad_; + + // fetch CPU time statistics + + mib[0] = CTL_KERN ; + mib[1] = KERN_CP_TIME ; + + size = CPUSTATES * sizeof(cp_time[0]) ; + + if (-1 == sysctl (mib, 2, cp_time, &size, NULL, 0)) + return 0 ; + + load = cp_time[CP_USER] + cp_time[CP_SYS] ; + diff = load - d->oldLoad_ ; + d->oldLoad_ = load ; + + return (forgetThisOne ? 0 : diff); #else return 0; #endif @@@@ -420,6 +480,30 @@@@ NaughtyProcessMonitor::pidList() const free (kp) ; return l ; +#elif defined(__NetBSD__) + struct kinfo_proc2 *kp; + int nentries ; + int i ; + QValueList l; + + kp = kvm_getproc2(d->kd, KERN_PROC_ALL, 0, + sizeof(struct kinfo_proc2), &nentries); + + // time statistics and euid data are fetched only for processes in + // the pidList, so, instead of doing one sysctl per process for + // getLoad and canKill calls, simply cache the data we already have. + + d->cacheLoadMap_.clear () ; + d->uidMap_.clear () ; + for (i = 0; i < nentries; i++) { + l << (unsigned long) kp[i].p_pid ; + d->cacheLoadMap_.insert (kp[i].p_pid, + kp[i].p_cpticks) ; + d->uidMap_.insert (kp[i].p_pid, + kp[i].p_uid) ; + } + + return l ; #else QValueList l; return l; @@@@ -447,7 +531,7 @@@@ NaughtyProcessMonitor::getLoad(ulong pid load = userTime + sysTime; return true; -#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__) || defined(__NetBSD__) // use cache if (!d->cacheLoadMap_.contains(pid)) return false ; @@@@ -464,7 +548,7 @@@@ NaughtyProcessMonitor::getLoad(ulong pid bool NaughtyProcessMonitor::kill(ulong pid) const { -#if defined(__linux__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) return 0 == ::kill(pid, SIGKILL); #else Q_UNUSED( pid ); @ 1.12 log @Fix build on NetBSD 3. PR pkg/37907 from Robert Elz. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ @ 1.11 log @Various kdebase updates. Option to build kompmgr - from Sergey Svishchev improved kdeeject script - from Sergey Svishchev ksysguard tidyup, improved handling of process list. infocenter tidyup Add NetBSD support to kicker/applets/naughty (finally fixing PR 25052) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- kicker/applets/naughty/NaughtyProcessMonitor.cpp.orig 2007-12-30 16:38:02.000000000 +1300 d5 1 a5 1 @@@@ -20,7 +20,7 @@@@ d12 1 d15 2 a16 1 @@@@ -29,6 +29,11 @@@@ d28 1 a28 1 @@@@ -67,10 +72,13 @@@@ class NaughtyProcessMonitorPrivate d43 1 a43 1 @@@@ -95,11 +103,17 @@@@ NaughtyProcessMonitor::NaughtyProcessMon d61 1 a61 1 @@@@ -219,7 +233,7 @@@@ NaughtyProcessMonitor::canKill(ulong pid d70 1 a70 1 @@@@ -234,7 +248,7 @@@@ NaughtyProcessMonitor::canKill(ulong pid d79 1 a79 1 @@@@ -283,6 +297,29 @@@@ NaughtyProcessMonitor::processName(ulong d109 1 a109 1 @@@@ -350,6 +387,28 @@@@ NaughtyProcessMonitor::cpuLoad() const d138 1 a138 1 @@@@ -420,6 +479,30 @@@@ NaughtyProcessMonitor::pidList() const d169 1 a169 1 @@@@ -447,7 +530,7 @@@@ NaughtyProcessMonitor::getLoad(ulong pid d178 1 a178 1 @@@@ -464,7 +547,7 @@@@ NaughtyProcessMonitor::getLoad(ulong pid @ 1.10 log @Update to KDE 3.5.7 KDE base * Various DragonFlyBSD fixes. * Removed "Serbia and Montenegro" (yu), added "Serbia" (rs) and "Montenegro" (me). Kicker * Added option to change the font color used by the taskbar applet. Kate * Fix not honoring current locale in some situations. KControl * Allow changing of font colors for taskbar. * Fix various crashes on KHotKeys. KDesktop * Use mkfontscale/mkfontdir to create fonts.scale/fonts.dir - as opposed to custom code. * Make kdesktop_lock honour kiosk switch user restriction. KWin * Option to turn off alt+tab outline. * Support for new windows types for compositing. * Fix bug in dead program detection in 64 bit architectures. * Fix crash on consecutive 'Show Desktop'. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.9 2007/01/26 02:49:25 markd Exp $ d3 3 a5 5 --- kioslave/media/kfile-plugin/kfilemediaplugin.cpp.orig 2007-01-25 11:51:55.000000000 +1300 +++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp @@@@ -29,7 +29,22 @@@@ #include #include d7 3 a9 1 -#include d11 10 a20 6 +# include +# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define HAVE_STATVFS 1 +# endif +#else +# define HAVE_STATVFS 1 d23 14 a36 6 +#ifdef HAVE_STATVFS +# include +#else +# include +# define statvfs statfs +# define f_frsize f_bsize d38 131 d170 15 a184 2 typedef KGenericFactory KFileMediaPluginFactory; K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media")) @ 1.9 log @Update KDE to 3.5.6 kicker * More support for compiz as a window manager. * Pick up timezone changes when reconfiguring. * Prevent the systray from flickering e.g. when a new window is opened/closed. KWin * Claim _NET_WM_CM_Sn compositing manager selection when compositing. * Fix mouse dragging in dual-head non-xinerama mode. * Fix crash while switching show desktop state. * Avoid focus problems with non-click-to-focus policies. * Fix click-raise with a compositing manager running. * Fix X resources leaks in kompmgr. * Fix click-raise interaction with panels. * Avoid possible race condition when withdrawing windows. kdesktop * Fix crash when typing "56+" in minicli (i.e. when bc gives a parse error). * Fix F5 not doing anything on the desktop. * Fix OpenGL screensavers rendering. kmenu * Install the Games/Kids Games file with the correct filename. Kate * Added session chooser panel applet and KMenu extension. konqueror * DCOP support for splitting the view. * Make the konqueror main window a group leader to ensure modal dialogs from one window do not block other konqueror main windows. * Dynamically enable/disable "Empty Trash" entry. * Fix crash when scanning for new plugins, then changing plugin settings. * Fix crash after a lot of cut&paste operations in tree view. konsole * Correct calculation of colour values in 256-colour mode. * Fix crash when saving history twice. * Fix crash if setting font to a size which is larger than the terminal display. kioslave * fish:/ kioslave is now able to handle files > 2GB. * Fix correct display of file size transfers > 2GB in smb:/. * Fix files that start with # showing as folders in fish:/. * Symlinks in trash now show symlink size instead of file size. * Fix correct calculation of percent diskfree. kfind * Fix URL usage with filenames including special chars. * Show a user-friendly URL in the "Look in:" field. ksysguard * Only show the penguin for linux systems. Otherwise use the system icon. * Set the focus to the search line when started with ctrl+esc. Fix the tab ordering. * Fix various stability problems. * Fix when you reorder the sensors. * Number of horizontal lines in the plotter was off by one. Plus it tries hard to show the top bar when asked to. * Fix (mostly) the selection of processes. * Make the setting dialogs non-modal, so it doesn't freeze kicker when you use them. * Displaying a number (LCD style) now works even with tiny kicker. * Make the connection to ksysguardd more robust. kcontrol * Fonts settings module by default does not affect system-wide font rendering settings. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Update to KDE 3.5.2 * Klipper o Handle URLs as URLs and not as Text o Prevent crashes caused by corrupted history o XFixes support (especially helps with broken clipboard implementations of some non-KDE applications) o Images are ignored by default, add 'IgnoreImages=false' to '[General]' in klipperrc o Avoid repeated action popup with the same URL with some non-KDE applications with broken clipboard implementations * Konsole o Correct issue where history size is unlimited when dealing with History options in profiles o Correctly set Tab bar when set to Dynamic Hide after session restore * Country settings o Fix short date format for Switzerland o Fix address format (especially P.O. Box) for Switzerland * KSysGuard o Show the sensors with values of more than two digits correctly in the applet * Kicker o Connect the applications to systray correctly on startup o Panels properly reserve space at screen edges even for differently sized Xinerama screens * Konqueror o Resolve symlinks only on the desktop * KWin o Added new window-specific rules for OpenOffice.org, XV and Mozilla family applications for turning off focus stealing prevention, as these applications don't work well with it o Reverted a workaround that as a side-effect had broken systray docking of some applications o Each virtual desktop has a separate focus chain * KDesktop o Fixed stacking of some dialogs @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.7 2006/01/31 22:25:34 markd Exp $ d3 5 a7 5 --- ksmserver/legacy.cpp.orig 2006-01-20 06:01:08.000000000 +1300 +++ ksmserver/legacy.cpp @@@@ -34,6 +34,10 @@@@ CONNECTION WITH THE SOFTWARE OR THE USE #include #endif d9 8 a16 2 +#ifdef HAVE_SYS_TIME_H +#include d19 7 a25 1 #include "server.h" d27 2 a28 1 #include @ 1.7 log @Update to KDE 3.5.1 Changes: * man KIO slave o fix processing of URLs in man documents o allow comment lines after a .TP request * Konqueror o 2 Tools menus when embedding KPDF in Konqueror * KDesktop o Fix initializations for desktops >4 when using DCOP calls. * Konsole o Update blue/red icons to be more distinguishable. o The history options (line #/enabled) are now used in the profiles. * Kwin o Incorrectly restored window geometry upon leaving fullscreen mode under certain circumstances @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @update to kde 3.2.3 changes: * general: More and better usage of icons in different applications * general: Fix link order for IRIX * kappfinder: Fixed menu structure and added icons of several applications * kicker: Don't show unimplemented "About" and "Preferences" for universal sidebar * kicker: Fix two panels on different xinerama screens affecting their placement. * konqueror/kdesktop: Fix konqueror is ignoring umask when creating new files * konqueror/kdesktop: Fix filename suggestion when moving files applies to all subsequent files * konqueror: Made all items in the "Go" menu open in the current Konqueror window * konqueror: Now Ctrl+Enter opens a tab with default background setting * konqueror: Holding Shift while opening a tab inverses the "open tabs ini background" setting * konqueror: "[FMSettings] TabPosition=Bottom" in konquerorrc lets the tabbar appear at bottom * konqueror: Fix konqueror listview rightclick always selects file * konsole: Added the ability to fetch the shell PID per session via DCOP * konsole: Fix terminal size display is covered by kwin size display * konsole: Fix Default rendition should be used when clearing screen areas * konsole: Fix can't change/save Keytabs in the Session Editor * konsole: Fix for crashes on exit. * konsole: Fix transparant background updates * kio_fish: Fixes for copying into a symlink to a folder, and for copying over a directory that already exists * kwin: Keep properly splashscreens above their mainwindows. * kwin: Restore focus when a broken application sets it to nowhere. * kwin: Fix dialog placement problems with Konqueror with Qt-3.2.x . * kwin: Fix problem with minimizing xmms. * kwin: Fix active desktop borders while moving improper initialization. * kwin: Fix Shift+middle mouse button action in Konqueror. * klipper: Fix Klipper reacting to its own clipboard changes. * khotkeys: Mouse gestures are globally disabled by default. * drkonqi: Fix valid backtraces sometimes being reported as useless. * kcontrol: Fix colorsheme file name conflict @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.5 2004/05/01 07:32:15 tron Exp $ d3 5 a7 6 Fixes build with Freetype-2.1.8, see: http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebase/kcontrol/kfontinst/lib/FontEngine.cpp --- kcontrol/kfontinst/lib/FontEngine.cpp 2004/03/30 21:17:35 1.12.2.2 +++ kcontrol/kfontinst/lib/FontEngine.cpp 2004/04/27 20:30:25 1.12.2.3 @@@@ -522,14 +522,33 @@@@ void CFontEngine::createPreview(int widt d9 2 a10 9 FT_Face face; FT_Size size; - FTC_Image_Desc font; +#if KFI_FT_IS_GE(2, 1, 8) + FTC_ScalerRec scaler; + FTC_ImageTypeRec font; +#else + FTC_Image_Desc font; d13 1 a13 100 +#if KFI_FT_IS_GE(2, 1, 8) + font.face_id=getId(itsPath, faceNo); + font.width=font.height=point2Pixel(sizes[s].font); + font.flags=FT_LOAD_DEFAULT; + scaler.face_id=font.face_id; + scaler.width=scaler.height=font.width; + scaler.pixel=1; +#else font.font.face_id=getId(itsPath, faceNo); font.font.pix_width=font.font.pix_height=point2Pixel(sizes[s].font); font.image_type=ftc_image_grays; +#endif FT_F26Dot6 startX=sizes[s].offset, +#if KFI_FT_IS_GE(2, 1, 8) + startY=sizes[s].offset+font.height, +#else startY=sizes[s].offset+font.font.pix_height, +#endif x=startX, y=startY; @@@@ -570,7 +589,12 @@@@ void CFontEngine::createPreview(int widt y+=startY; } +#if KFI_FT_IS_GE(2, 1, 8) + if(!FTC_Manager_LookupFace(itsFt.cacheManager, scaler.face_id, &face) && + !FTC_Manager_LookupSize(itsFt.cacheManager, &scaler, &size)) +#else if(!FTC_Manager_Lookup_Size(itsFt.cacheManager, &(font.font), &face, &size)) +#endif { int i; FT_F26Dot6 stepY=size->metrics.y_ppem /*(size->metrics.height>>6)*/ + sizes[s].offset; @@@@ -585,14 +609,24 @@@@ void CFontEngine::createPreview(int widt unsigned int ch; for(ch=0; chmetrics.y_ppem /*(size->metrics.height>>6)*/ + sizes[s].offset; @@@@ -603,12 +637,15 @@@@ void CFontEngine::createPreview(int widt y+=stepY; x=startX; } - +#if KFI_FT_IS_GE(2, 1, 8) + y+=font.height; +#else y+=font.font.pix_height; +#endif } for(i=1; inum_glyphs; ++i) // Glyph 0 is the NULL glyph - if(drawGlyph(pix, font, size, i, x, y, width, height, startX, stepY)) + if(drawGlyph(pix, font, i, x, y, width, height, startX, stepY)) break; } } @@@@ -621,14 +658,14 @@@@ void CFontEngine::createPreview(int widt unsigned int ch; for(ch=0; chnum_glyphs; ++i) // Glyph 0 is the NULL glyph - if(drawGlyph(pix, font, size, i, x, y, width, height, startX, stepY)) + if(drawGlyph(pix, font, i, x, y, width, height, startX, stepY)) break; } @@@@ -2858,8 +2895,13 @@@@ FTC_FaceID CFontEngine::getId(const QStr return (FTC_FaceID)p; } d15 1 a15 225 +#if KFI_FT_IS_GE(2, 1, 8) +bool CFontEngine::getGlyphBitmap(FTC_ImageTypeRec &font, FT_ULong index, Bitmap &target, int &left, int &top, + int &xAdvance, FT_Pointer *ptr) +#else bool CFontEngine::getGlyphBitmap(FTC_Image_Desc &font, FT_ULong index, Bitmap &target, int &left, int &top, int &xAdvance, FT_Pointer *ptr) +#endif { bool ok=false; @@@@ -2867,13 +2909,23 @@@@ bool CFontEngine::getGlyphBitmap(FTC_Ima // // Cache small glyphs, else render on demand... +#if KFI_FT_IS_GE(2, 1, 8) + if(font.width<48 && font.height<48) +#else if(font.font.pix_width<48 && font.font.pix_height<48) +#endif { FTC_SBit sbit; - if(!FTC_SBit_Cache_Lookup(itsFt.sBitCache, &font, index, &sbit)) +#if KFI_FT_IS_GE(2, 1, 8) + if(!FTC_SBitCache_Lookup(itsFt.sBitCache, &font, index, &sbit, NULL) && sbit->buffer) +#else + if(!FTC_SBit_Cache_Lookup(itsFt.sBitCache, &font, index, &sbit) && sbit->buffer) +#endif { - target.greys=ft_pixel_mode_mono==sbit->format ? 2 : 256; + target.greys=sbit->max_grays+1; // ft_pixel_mode_mono==sbit->format ? 2 : 256; + target.mono=ft_pixel_mode_mono==sbit->format ? true : false; + target.pitch=sbit->pitch; target.height=sbit->height; target.width=sbit->width; target.buffer=sbit->buffer; @@@@ -2883,11 +2935,15 @@@@ bool CFontEngine::getGlyphBitmap(FTC_Ima ok=true; } } - else + if(!ok) { FT_Glyph glyph; +#if KFI_FT_IS_GE(2, 1, 8) + if(!FTC_ImageCache_Lookup(itsFt.imageCache, &font, index, &glyph, NULL)) +#else if(!FTC_Image_Cache_Lookup(itsFt.imageCache, &font, index, &glyph)) +#endif { ok=true; @@@@ -2896,12 +2952,14 @@@@ bool CFontEngine::getGlyphBitmap(FTC_Ima *ptr=glyph; if(ok) - if(ft_glyph_format_bitmap==glyph->format) + if(ft_glyph_format_bitmap==glyph->format && ((FT_BitmapGlyph)glyph)->bitmap.buffer) { FT_BitmapGlyph bitmap=(FT_BitmapGlyph)glyph; FT_Bitmap *source=&(bitmap->bitmap); - target.greys= (ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode) ? 1 : source->num_grays; + target.greys=ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode ? 2 : source->num_grays; + target.mono=ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode ? true : false; + target.pitch=source->pitch; target.height=source->rows; target.width=source->width; target.buffer=source->buffer; @@@@ -2919,14 +2977,12 @@@@ bool CFontEngine::getGlyphBitmap(FTC_Ima void CFontEngine::align32(Bitmap &bmp) { - int mod=bmp.width%4; + // Pitch = number of bytes per row of the bitmap. This needs to fall on a 32bit (4byte) boundary. + int padBytes=4-(bmp.pitch%4); - if(mod) + if(padBytes<4) { - bmp.mod=4-mod; - - int width=bmp.width+bmp.mod, - size=(bmp.width+bmp.mod)*bmp.height, + int size=(bmp.pitch+padBytes)*bmp.height, row; if(size>itsFt.bufferSize) @@@@ -2939,20 +2995,23 @@@@ void CFontEngine::align32(Bitmap &bmp) itsFt.buffer=new unsigned char [itsFt.bufferSize]; } - memset(itsFt.buffer, 0, itsFt.bufferSize); + //memset(itsFt.buffer, 0, itsFt.bufferSize); for(row=0; row0 && bmp.height>0) { - if(2==bmp.greys) + if(x+xAdvance+1>width) { - QPixmap glyphPix(QBitmap(bmp.width, bmp.height, bmp.buffer)); + x=startX; + y+=stepY; - bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, bmp.width, bmp.height, Qt::AndROP); + if(y>height) + return true; } - else - { - static QRgb clut[256]; - static bool clutSetup=false; - if(!clutSetup) - { - int j; - for(j=0; j<256; j++) - clut[j]=qRgb(255-j, 255-j, 255-j); - clutSetup=true; - } + static QRgb clut8[256]; + static QRgb clut1[2]={ qRgb(255, 255, 255), qRgb(0, 0, 0) }; + static bool clut8Setup=false; - align32(bmp); + if(!bmp.mono && !clut8Setup) + { + int j; + for(j=0; j<256; j++) + clut8[j]=qRgb(255-j, 255-j, 255-j); + clut8Setup=true; + } - QPixmap glyphPix(QImage(bmp.buffer, bmp.width, bmp.height, 8, clut , bmp.greys, QImage::IgnoreEndian)); + align32(bmp); - bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, bmp.width, bmp.height, Qt::AndROP); - } + QPixmap glyphPix(QImage(bmp.buffer, bmp.width, bmp.height, bmp.mono ? 1 : 8, bmp.mono ? clut1 : clut8, bmp.mono ? 2 : bmp.greys, + QImage::BigEndian)); + + bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, glyphPix.width(), glyphPix.height(), Qt::AndROP); if(glyph) FT_Done_Glyph((FT_Glyph)glyph); x+=xAdvance+1; - - if(x+size->metrics.x_ppem>width) - { - x=startX; - y+=stepY; - - if(y>height) - return true; - } } else if(x!=startX) x+=space; @@@@ -3015,7 +3067,6 @@@@ CFontEngine::TFtData::TFtData() , buffer(NULL), bufferSize(0) #endif - { if(FT_Init_FreeType(&library)) { @@@@ -3024,9 +3075,29 @@@@ CFontEngine::TFtData::TFtData() } #ifdef HAVE_FT_CACHE ids.setAutoDelete(true); - FTC_Manager_New(library, 0, 0, 0, face_requester, 0, &cacheManager); - FTC_SBit_Cache_New(cacheManager, &sBitCache); - FTC_Image_Cache_New(cacheManager, &imageCache); + if(FTC_Manager_New(library, 0, 0, 0, face_requester, 0, &cacheManager)) + { + std::cerr << "ERROR: Could not initliaze FreeType2 cache manager\n"; + exit(0); + } +#if KFI_FT_IS_GE(2, 1, 8) + if(FTC_SBitCache_New(cacheManager, &sBitCache)) +#else + if(FTC_SBit_Cache_New(cacheManager, &sBitCache)) +#endif + { + std::cerr << "ERROR: Could not initliaze FreeType2 small bitmaps cache\n"; + exit(0); + } +#if KFI_FT_IS_GE(2, 1, 8) + if(FTC_ImageCache_New(cacheManager, &imageCache)) +#else + if(FTC_Image_Cache_New(cacheManager, &imageCache)) +#endif + { + std::cerr << "ERROR: Could not initliaze FreeType2 glyph image cache\n"; + exit(0); + } #endif } @ 1.5 log @Remove revision id from patches to avoid CVS problems. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.4 2004/04/30 01:42:11 xtraeme Exp $ @ 1.4 log @Apply patches from KDE CVS to fix building with freetype2 2.1.8. @ text @d1 1 a1 1 $NetBSD$ a7 9 @@@@ -4,7 +4,7 @@@@ // Author : Craig Drummond // Project : K Font Installer // Creation Date : 29/04/2001 -// Version : $Revision: 1.12.2.2 $ $Date: 2004/03/30 21:17:35 $ +// Version : $Revision: 1.12.2.3 $ $Date: 2004/04/27 20:30:25 $ // //////////////////////////////////////////////////////////////////////////////// // @ 1.3 log @Update to KDE-3.2 Changes: Base Kate * Moving KATE view management over to KMDI Joseph Wenninger * Basic project managment Christoph Cullmann KControl * Xinerama KControl module, enhanced KDE Xinerama and dual-head support George Staikos * add/update control module for configuring per-domain settings. See Bug 49145. Leo Savernik * Support for per-style configuration settings in the style control center module, a module for Keramik Maksim Orlovich * Add support for installing/removing- and switching Xcursor themes to the mouse KControl module Fredrik Hoeglund * Font installer - create fonts:/ ioslave, and modify KControl module to use this. See http://members.lycos.co.uk/cpdrummond for (old) screenshots/download Craig Drummond KHotKeys * Update to version 2.0, which includes more features like mouse gestures. Lubos Lunak KWin * Full support for latest NETWM spec version in KWin, and seamless usage of other compliant window managers with KDE. Lubos Lunak * New API for window decoration plugins. Lubos Lunak * Focus stealing prevention. Lubos Lunak * Add an option to allow wide borders to some of the window decoration styles Gunnar Schmi DT Kicker * Make addition of non-KDE applications to Kicker easier Alexander Kellett * Enable backgrounds for child panels and all applets, allow for colorization of background pixmaps Aaron J. Seigo * Allow applets to export a menu to the handle Aaron J. Seigo * User defined plain colors for tiles Aaron J. Seigo * Make the panel transparent. Zack Rusin * Add an option to the RMB-menu and to the "Advanced Options" in kcontrol to enable/disable the panel handle when "Custom" size is selected. KDM * More sophisticated session definitions, common with GDM Oswald Buddenhagen * Pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen Various (kwin, kdesktop, kcontrol, ksmserver) * Optimally support the X Resize and Rotate extension. Hamish Rodda All KDE applications (kdebase/kdenetwork/kdepim/kdegraphics,...) * No absolute paths to user home directories in KDE config files. This allows to support roaming users. Helge Deller Konsole * Add a better interface to konsolepart for other apps. Dominique Devriese * Added "Set Selection End" to right mouse button menu. * Column text selecting when Ctrl and Alt are pressed * Uses now KTabWidget, allows tab context menus and more Stephan Binner * Utilize KNotify (e.g. passive popup) for "Activity", "Bell", "Shell Exit" and "Silence" events * ZModem up- and download (requires rzsz) Waldo Bastian * Make bidi rendering (for RTL languages) configurable. Meni Livne KEditBookmarks * Export to HTML and printing of bookmark collection. Alexander Kellett * Recursive favicon updates in bookmark editor. Alexander Kellett * Field for incremental searching on titles. Alexander Kellett * Opera and Internet Explorer bookmark collection exporting. Alexander Kellett * Bookmark editor now includes an extra pane to allow title/url editing without use of context menu / keyboard shortcuts. Alexander Kellett * More detailed bookmark access information (last viewed, first seen, view counts). Alexander Kellett * Recursive - entire collection, per folder - alphabetical sorting Alexander Kellett Konqueror * Enhanced Konqueror statusbar and kpart statusbar extension. Statusbar notifications for secure connections, wallet, js errors. David Faure, George Staikos * Bookmarklets support in the form of a "Mini-tools" konq-plugin Alexander Kellett * Addition of an advanced Add Bookmark dialog. Alexander Kellett * Read-only bookmark menu includes. Alexander Kellett * Ability to select which items should be shown in the bookmark bar. Alexander Kellett * Servicemenu improvements: placed in a common Actions submenu, allow grouping into submenus, allow for separators, allow simple mimetype globbing Aaron J. Seigo * Bookmarking of all loaded tabs as a folder. Alexander Kellett * Lightweight bookmark editing from within bookmarks menu via context menu. Alexander Kellett * New sidebar module: Web. Implements sidebar modules similar to those introduced in Netscape 6/Mozilla. George Staikos * Konqueror "preloading", often reducing Konqueror startup time. Lubos Lunak * Spellchecking in text forms and spelling highlighting Scott Wheeler, Don Sanders Tabbed Browsing * "New Tab" and "Close Tab" buttons besides the tab bar Stephan Binner * Loading/read state indication by tab color Stephan Binner * Drag and drop support from/to tabs and to empty tab bar space Stephan Binner * Allow to reorder tabs with pressed middle mouse button Stephan Binner * Middle mouse button on tabs or empty tab bar space opens clipboard content Stephan Binner * Support for opening external URLs and popups in new tabs Stephan Binner * Optional permanent close buttons within tabs and permanent shown tab bar Stephan Binner KHTML part * KHTML: Implement caret mode. This is a prerequisite for designmode. See Bug 48302. Leo Savernik * KHTML: add infrastructure for per-domain settings. See Bug 49145. Leo Savernik * better support for samba shares through libsmbclient of samba 3.0 Stephan Kulow KIO Slaves * kio_smtp: SMTP pipelining support for faster submission, esp. over high-latency links. Marc Mutz KDesktop * Added GUI for "Mouse wheel over desktop switches desktop" option. * Make screen savers capable of being DPMS aware, so they can be disabled when watching a movie or TV if the app sets up X DPMS appropriately. Gregor Jasny * Screen locker: pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen * Shadow behind the text of the desktop icons, for more readability Laur Ivan * E-mail addresses entered in "Run Command..." (Alt-F2) will start mailer. Waldo Bastian * Numeric expression in "Run Command..." (Alt-F2) is evaluated. Waldo Bastian @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2002/08/25 19:23:36 jlam Exp $ d3 26 a28 22 --- kcontrol/access/Makefile.am.orig Wed May 8 19:20:50 2002 +++ kcontrol/access/Makefile.am @@@@ -4,16 +4,20 @@@@ bin_PROGRAMS = kaccess -kaccess_SOURCES = dummy.cpp +kaccess_SOURCES = kaccess_main.cpp kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kaccess_LDADD = kaccess.la +kaccess_LDADD = libkaccess_main.la kde_module_LTLIBRARIES = kcm_access.la -lib_LTLIBRARIES = kaccess.la +lib_LTLIBRARIES = libkaccess_main.la kaccess.la -kaccess_la_SOURCES = kaccess.cpp main.cpp -kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +libkaccess_main_la_SOURCES = kaccess.cpp main.cpp +libkaccess_main_la_LDFLAGS = $(all_libraries) +libkaccess_main_la_LIBADD = $(LIB_KDEUI) d30 290 a319 10 +kaccess_la_SOURCES = kaccess_main.cpp +kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version +kaccess_la_LIBADD = libkaccess_main.la kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@@@ -32,6 +36,3 @@@@ messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot d321 35 a355 2 -dummy.cpp: - echo > dummy.cpp @ 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-ah,v 1.1.2.1 2002/06/23 19:05:16 jlam Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdebase3 pkg @ text @@ 1.1.1.1.2.1 log @file patch-ah was added on branch buildlink2 on 2002-06-23 19:05:16 +0000 @ text @d1 38 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 38 $NetBSD: patch-ah,v 1.1.1.1.2.1 2002/06/23 19:05:16 jlam Exp $ --- kcontrol/access/Makefile.am.orig Wed May 8 19:20:50 2002 +++ kcontrol/access/Makefile.am @@@@ -4,16 +4,20 @@@@ bin_PROGRAMS = kaccess -kaccess_SOURCES = dummy.cpp +kaccess_SOURCES = kaccess_main.cpp kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kaccess_LDADD = kaccess.la +kaccess_LDADD = libkaccess_main.la kde_module_LTLIBRARIES = kcm_access.la -lib_LTLIBRARIES = kaccess.la +lib_LTLIBRARIES = libkaccess_main.la kaccess.la -kaccess_la_SOURCES = kaccess.cpp main.cpp -kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +libkaccess_main_la_SOURCES = kaccess.cpp main.cpp +libkaccess_main_la_LDFLAGS = $(all_libraries) +libkaccess_main_la_LIBADD = $(LIB_KDEUI) + +kaccess_la_SOURCES = kaccess_main.cpp +kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version +kaccess_la_LIBADD = libkaccess_main.la kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@@@ -32,6 +36,3 @@@@ messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot - -dummy.cpp: - echo > dummy.cpp @