kdebase 3.1:
- use kcontrol/nics/nic.cpp from kde-current to access getifaddrs... IPv4 masks are not printed properly yet. - konsole fixes for utmp - ksysguardd mostly working. Should unify with Net/FreeBSD - clock and timezone fixes mostly from Flinn Mueller. - uses kxkb_pic lib, thanks to Matthieu.
This commit is contained in:
parent
afc93b7049
commit
a4d2f30a9a
@ -1,16 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2003/01/10 14:56:27 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2003/01/27 19:22:49 espie Exp $
|
||||
|
||||
COMMENT= "X11 toolkit, basic applications"
|
||||
CATEGORIES= x11 x11/kde
|
||||
VERSION= 3.0.5a
|
||||
VERSION= 3.1
|
||||
DISTNAME= kdebase-${VERSION}
|
||||
|
||||
LIB_DEPENDS= kdecore.4,DCOP,artskde,kabc,katepartinterfaces,kdefakes,kdefx,kdeprint,kdeprint_management,kdesasl,kdesu,kdeui,khtml,kio,kjava,kmid,kparts,kscreensaver,kscript,kspell,ktexteditor,vcard::x11/kde/libs3 \
|
||||
LIB_DEPENDS= kdecore.4,DCOP,artskde,kabc,katepartinterfaces,kdefakes,kdefx,kdeprint,kdeprint_management,kdesasl,kdesu,kdeui,khtml,kio,kmid,kparts,kscreensaver,kscript,kspell,ktexteditor,kutils,vcard::x11/kde/libs3 \
|
||||
ldap.2,lber:openldap-client-2.*:databases/openldap \
|
||||
vorbis,vorbisenc::audio/libvorbis \
|
||||
cdda_paranoia,cdda_interface::audio/cdparanoia
|
||||
|
||||
BUILD_DEPENDS= ::audio/lame
|
||||
SEPARATE_BUILD= flavored
|
||||
|
||||
post-install:
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (kde/kdebase-3.0.5a.tar.bz2) = 16c53e754e866f112797f695ba84c3a4
|
||||
RMD160 (kde/kdebase-3.0.5a.tar.bz2) = 4b8e47da2c33882dcea860f81cf0091a3c5bde28
|
||||
SHA1 (kde/kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1
|
||||
MD5 (kde/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
|
||||
RMD160 (kde/kdebase-3.1.tar.bz2) = fe6a81d9ed884b1940a20b629405f2e88e3f8602
|
||||
SHA1 (kde/kdebase-3.1.tar.bz2) = 8b1e7dbecf476f84fa4332e88b15ae6be562f0d8
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-configure_in,v 1.6 2003/01/09 02:47:40 espie Exp $
|
||||
--- configure.in.orig Wed Jan 8 20:39:13 2003
|
||||
+++ configure.in Wed Jan 8 22:57:28 2003
|
||||
@@ -1339,6 +1339,7 @@ AC_MSG_CHECKING(if ksysguardd can be com
|
||||
$OpenBSD: patch-configure_in,v 1.7 2003/01/27 19:22:50 espie Exp $
|
||||
--- configure.in.orig Fri Jan 3 18:13:15 2003
|
||||
+++ configure.in Thu Jan 9 23:22:49 2003
|
||||
@@ -865,6 +865,7 @@ AC_MSG_CHECKING([if ksysguardd can be co
|
||||
case "$host" in
|
||||
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
|
||||
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
|
||||
+ *-*-openbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
|
||||
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
|
||||
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
|
||||
*-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
|
||||
*) ksysguardd_compile=no; UNAME='' ;;
|
||||
|
17
x11/kde/base3/patches/patch-kcontrol_clock_main_cpp
Normal file
17
x11/kde/base3/patches/patch-kcontrol_clock_main_cpp
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-kcontrol_clock_main_cpp,v 1.1 2003/01/27 19:22:50 espie Exp $
|
||||
--- kcontrol/clock/main.cpp.orig Sat Sep 21 18:54:57 2002
|
||||
+++ kcontrol/clock/main.cpp Mon Jan 13 10:48:30 2003
|
||||
@@ -65,8 +65,13 @@ KclockModule::KclockModule(QWidget *pare
|
||||
void KclockModule::save()
|
||||
{
|
||||
// The order here is important
|
||||
+#ifdef __OpenBSD__
|
||||
+ tzone->save();
|
||||
+ dtime->save();
|
||||
+#else
|
||||
dtime->save();
|
||||
tzone->save();
|
||||
+#endif
|
||||
|
||||
// it syncs up nicely without restarting
|
||||
// // restart kicker to sync up the time
|
89
x11/kde/base3/patches/patch-kcontrol_clock_tzone_cpp
Normal file
89
x11/kde/base3/patches/patch-kcontrol_clock_tzone_cpp
Normal file
@ -0,0 +1,89 @@
|
||||
$OpenBSD: patch-kcontrol_clock_tzone_cpp,v 1.1 2003/01/27 19:22:50 espie Exp $
|
||||
--- kcontrol/clock/tzone.cpp.orig Mon Jan 13 10:23:21 2003
|
||||
+++ kcontrol/clock/tzone.cpp Mon Jan 13 11:51:56 2003
|
||||
@@ -50,8 +50,14 @@
|
||||
#include <sys/stat.h>
|
||||
|
||||
#define ZONEINFODIR "/usr/share/lib/zoneinfo"
|
||||
+#define FIND_BINARY "/bin/find"
|
||||
#define INITFILE "/etc/default/init"
|
||||
#endif
|
||||
+#ifdef __OpenBSD__
|
||||
+#define ZONEINFODIR "/usr/share/zoneinfo"
|
||||
+#define FIND_BINARY "/usr/bin/find"
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
|
||||
Tzone::Tzone(QWidget * parent, const char *name)
|
||||
: QWidget (parent, name)
|
||||
@@ -94,14 +100,15 @@ void Tzone::fillTimeZones()
|
||||
|
||||
tzonelist->insertItem(i18n("[No selection]"));
|
||||
|
||||
-#if defined(USE_SOLARIS) // MARCO
|
||||
+#if defined(USE_SOLARIS) || defined(__OpenBSD__) // MARCO
|
||||
|
||||
FILE *fp;
|
||||
char buf[MAXPATHLEN];
|
||||
+ char *p = buf + strlen(ZONEINFODIR) + 1;
|
||||
|
||||
snprintf(buf, MAXPATHLEN,
|
||||
- "/bin/find %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-",
|
||||
- ZONEINFODIR, strlen(ZONEINFODIR) + 2);
|
||||
+ "%s %s \\( -name src -prune \\) -o -type f -print",
|
||||
+ FIND_BINARY, ZONEINFODIR);
|
||||
|
||||
fp = popen(buf, "r");
|
||||
if (fp)
|
||||
@@ -109,8 +116,8 @@ void Tzone::fillTimeZones()
|
||||
while(fgets(buf, MAXPATHLEN - 1, fp) != NULL)
|
||||
{
|
||||
buf[strlen(buf) - 1] = '\0';
|
||||
- list << i18n(buf);
|
||||
- tzonenames << buf;
|
||||
+ list << i18n(p);
|
||||
+ tzonenames << p;
|
||||
}
|
||||
pclose(fp);
|
||||
}
|
||||
@@ -174,6 +181,14 @@ void Tzone::load()
|
||||
}
|
||||
pclose(fp);
|
||||
}
|
||||
+#elif defined(__OpenBSD__)
|
||||
+ char buffer[MAXPATHLEN];
|
||||
+ int n;
|
||||
+ n = readlink("/etc/localtime", buffer, sizeof(buffer)-1);
|
||||
+ if (n != -1) {
|
||||
+ buffer[n] = 0;
|
||||
+ sCurrentlySet = buffer + strlen(ZONEINFODIR)+1;
|
||||
+ }
|
||||
#else
|
||||
QFile f("/etc/timezone");
|
||||
if(f.open(IO_ReadOnly))
|
||||
@@ -272,6 +287,7 @@ void Tzone::save()
|
||||
|
||||
QString val = selectedzone;
|
||||
#else
|
||||
+#if !defined(__OpenBSD__)
|
||||
QFile fTimezoneFile("/etc/timezone");
|
||||
|
||||
if (fTimezoneFile.open(IO_WriteOnly | IO_Truncate) )
|
||||
@@ -281,6 +297,7 @@ void Tzone::save()
|
||||
fTimezoneFile.close();
|
||||
}
|
||||
|
||||
+#endif
|
||||
tz = "/usr/share/zoneinfo/" + selectedzone;
|
||||
|
||||
kdDebug() << "Set time zone " << tz << endl;
|
||||
@@ -299,7 +316,9 @@ void Tzone::save()
|
||||
|
||||
} else {
|
||||
#if !defined(USE_SOLARIS) // Do not update the System!
|
||||
+#if !defined(__OpenBSD__)
|
||||
unlink( "/etc/timezone" );
|
||||
+#endif
|
||||
unlink( "/etc/localtime" );
|
||||
|
||||
setenv("TZ", "", 1);
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-kcontrol_nics_nic_cpp,v 1.1 2003/01/09 02:49:04 espie Exp $
|
||||
--- kcontrol/nics/nic.cpp.orig Mon Jun 24 13:56:11 2002
|
||||
+++ kcontrol/nics/nic.cpp Thu Jan 9 01:16:01 2003
|
||||
$OpenBSD: patch-kcontrol_nics_nic_cpp,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- kcontrol/nics/nic.cpp.orig Thu Dec 5 21:40:07 2002
|
||||
+++ kcontrol/nics/nic.cpp Sat Jan 11 05:48:40 2003
|
||||
@@ -37,6 +37,7 @@
|
||||
#endif
|
||||
|
||||
@ -9,65 +9,19 @@ $OpenBSD: patch-kcontrol_nics_nic_cpp,v 1.1 2003/01/09 02:49:04 espie Exp $
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <stdio.h>
|
||||
@@ -55,8 +56,13 @@
|
||||
@@ -55,6 +56,11 @@
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
-typedef KGenericFactory<KCMNic, QWidget > KCMNicFactory;
|
||||
-K_EXPORT_COMPONENT_FACTORY (kcm_nic, KCMNicFactory("kcmnic") );
|
||||
+#include <ifaddrs.h>
|
||||
+#include <netdb.h>
|
||||
+
|
||||
+QString flags_tos (unsigned int flags);
|
||||
+
|
||||
+typedef KGenericFactory<KCMNic, QWidget> KCMNicFactory;
|
||||
+K_EXPORT_COMPONENT_FACTORY (kcm_nic, KCMNicFactory("kcmnic"));
|
||||
typedef KGenericFactory<KCMNic, QWidget > KCMNicFactory;
|
||||
K_EXPORT_COMPONENT_FACTORY (kcm_nic, KCMNicFactory("kcmnic") );
|
||||
|
||||
struct MyNIC
|
||||
{
|
||||
@@ -71,6 +77,21 @@ typedef QPtrList<MyNIC> NICList;
|
||||
|
||||
NICList* findNICs();
|
||||
|
||||
+
|
||||
+const KAboutData* KCMNic::aboutData() const
|
||||
+{
|
||||
+ KAboutData *about =
|
||||
+ new KAboutData(I18N_NOOP("kcminfo"),
|
||||
+ I18N_NOOP("KDE Panel System Information Control Module"),
|
||||
+ 0, 0, KAboutData::License_GPL,
|
||||
+ I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf"));
|
||||
+
|
||||
+ about->addAuthor("Alexander Neundorf", 0, "neundorf@kde.org");
|
||||
+
|
||||
+ return about;
|
||||
+}
|
||||
+
|
||||
+
|
||||
KCMNic::KCMNic(QWidget *parent, const char * name, const QStringList &)
|
||||
:KCModule(KCMNicFactory::instance(), parent,name)
|
||||
{
|
||||
@@ -80,15 +101,15 @@ KCMNic::KCMNic(QWidget *parent, const ch
|
||||
m_list=new QListView(this);
|
||||
box->addWidget(m_list);
|
||||
m_list->addColumn(i18n("Name"));
|
||||
- m_list->addColumn(i18n("IP address"));
|
||||
- m_list->addColumn(i18n("Network mask"));
|
||||
+ m_list->addColumn(i18n("IP Address"));
|
||||
+ m_list->addColumn(i18n("Network Mask"));
|
||||
m_list->addColumn(i18n("Type"));
|
||||
m_list->addColumn(i18n("State"));
|
||||
- QHBoxLayout *hbox=new QHBoxLayout(this);
|
||||
+ m_list->setAllColumnsShowFocus(true);
|
||||
+ QHBoxLayout *hbox=new QHBoxLayout(box);
|
||||
m_updateButton=new QPushButton(i18n("&Update"),this);
|
||||
hbox->addWidget(m_updateButton);
|
||||
hbox->addStretch(1);
|
||||
- box->addLayout(hbox);
|
||||
QTimer* timer=new QTimer(this);
|
||||
timer->start(60000);
|
||||
connect(m_updateButton,SIGNAL(clicked()),this,SLOT(update()));
|
||||
@@ -112,76 +133,81 @@ NICList* findNICs()
|
||||
@@ -127,76 +133,81 @@ NICList* findNICs()
|
||||
NICList* nl=new NICList;
|
||||
nl->setAutoDelete(true);
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.1 2003/01/07 00:19:34 espie Exp $
|
||||
--- kcontrol/passwords/passwords.cpp.orig Tue Jan 7 00:39:16 2003
|
||||
+++ kcontrol/passwords/passwords.cpp Tue Jan 7 01:08:33 2003
|
||||
@@ -56,6 +56,11 @@ KPasswordConfig::KPasswordConfig(QWidget
|
||||
new QRadioButton(i18n("3 stars"), m_EMGroup);
|
||||
new QRadioButton(i18n("no echo"), m_EMGroup);
|
||||
$OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- kcontrol/passwords/passwords.cpp.orig Sun Sep 15 23:08:44 2002
|
||||
+++ kcontrol/passwords/passwords.cpp Thu Jan 9 23:26:17 2003
|
||||
@@ -57,6 +57,11 @@ KPasswordConfig::KPasswordConfig(QWidget
|
||||
new QRadioButton(i18n("&3 stars"), m_EMGroup);
|
||||
new QRadioButton(i18n("&No echo"), m_EMGroup);
|
||||
connect(m_EMGroup, SIGNAL(clicked(int)), SLOT(slotEchoMode(int)));
|
||||
+ m_SudoBut = new QCheckBox(i18n("&Use sudo"), this);
|
||||
+ QWhatsThis::add( m_SudoBut, i18n("You can choose to use <em>sudo</em> instead of <em>su</em><p>"
|
||||
@ -13,15 +13,15 @@ $OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.1 2003/01/07 00:19:34 espie
|
||||
|
||||
// Keep password
|
||||
|
||||
@@ -119,6 +124,7 @@ void KPasswordConfig::load()
|
||||
@@ -114,6 +119,7 @@ void KPasswordConfig::load()
|
||||
|
||||
m_bKeep = m_pConfig->readBoolEntry("Keep", defKeep);
|
||||
m_Timeout = m_pConfig->readNumEntry("Timeout", defTimeout);
|
||||
+ m_bSudo = m_pConfig->readBoolEntry("Sudo", defSudo);
|
||||
slotKeep(m_bKeep);
|
||||
|
||||
apply();
|
||||
emit changed(false);
|
||||
@@ -141,6 +147,7 @@ void KPasswordConfig::save()
|
||||
@@ -137,6 +143,7 @@ void KPasswordConfig::save()
|
||||
m_pConfig->writeEntry("Keep", m_bKeep, true, true);
|
||||
m_Timeout = m_TimeoutEdit->value()*60;
|
||||
m_pConfig->writeEntry("Timeout", m_Timeout, true, true);
|
||||
@ -29,7 +29,7 @@ $OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.1 2003/01/07 00:19:34 espie
|
||||
|
||||
m_pConfig->sync();
|
||||
|
||||
@@ -159,6 +166,7 @@ void KPasswordConfig::defaults()
|
||||
@@ -155,6 +162,7 @@ void KPasswordConfig::defaults()
|
||||
m_Echo = defEchoMode;
|
||||
m_bKeep = defKeep;
|
||||
m_Timeout = defTimeout;
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.1 2003/01/07 00:19:34 espie
|
||||
|
||||
apply();
|
||||
emit changed(true);
|
||||
@@ -169,6 +177,7 @@ void KPasswordConfig::apply()
|
||||
@@ -165,6 +173,7 @@ void KPasswordConfig::apply()
|
||||
{
|
||||
m_EMGroup->setButton(m_Echo);
|
||||
m_KeepBut->setChecked(m_bKeep);
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.1 2003/01/07 00:19:34 espie
|
||||
|
||||
m_TimeoutEdit->setValue(m_Timeout/60);
|
||||
m_TimeoutEdit->setEnabled(m_bKeep);
|
||||
@@ -189,6 +198,11 @@ void KPasswordConfig::slotKeep(bool keep
|
||||
@@ -185,6 +194,11 @@ void KPasswordConfig::slotKeep(bool keep
|
||||
emit changed(true);
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-kcontrol_passwords_passwords_h,v 1.1 2003/01/07 00:19:34 espie Exp $
|
||||
--- kcontrol/passwords/passwords.h.orig Tue Jan 7 00:41:41 2003
|
||||
+++ kcontrol/passwords/passwords.h Tue Jan 7 00:47:33 2003
|
||||
@@ -39,15 +39,18 @@ private slots:
|
||||
$OpenBSD: patch-kcontrol_passwords_passwords_h,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- kcontrol/passwords/passwords.h.orig Mon Nov 4 16:44:18 2002
|
||||
+++ kcontrol/passwords/passwords.h Sat Jan 11 05:41:35 2003
|
||||
@@ -40,15 +40,17 @@ private slots:
|
||||
|
||||
void slotEchoMode(int);
|
||||
void slotKeep(bool);
|
||||
@ -11,12 +11,12 @@ $OpenBSD: patch-kcontrol_passwords_passwords_h,v 1.1 2003/01/07 00:19:34 espie E
|
||||
QButtonGroup *m_EMGroup;
|
||||
QCheckBox *m_KeepBut;
|
||||
+ QCheckBox *m_SudoBut;
|
||||
QSpinBox *m_TimeoutEdit;
|
||||
KIntNumInput *m_TimeoutEdit;
|
||||
KConfig *m_pConfig;
|
||||
|
||||
int m_Echo, m_Timeout;
|
||||
bool m_bKeep;
|
||||
+ bool m_bSudo;
|
||||
- bool m_bKeep;
|
||||
+ bool m_bKeep, m_bSudo;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-kdesu_kdesu_kdesu_cpp,v 1.1 2003/01/07 00:19:34 espie Exp $
|
||||
--- kdesu/kdesu/kdesu.cpp.orig Tue Jan 7 00:59:51 2003
|
||||
+++ kdesu/kdesu/kdesu.cpp Tue Jan 7 01:12:51 2003
|
||||
@@ -267,10 +267,12 @@ int main(int argc, char *argv[])
|
||||
$OpenBSD: patch-kdesu_kdesu_kdesu_cpp,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- kdesu/kdesu/kdesu.cpp.orig Sun Sep 15 23:08:45 2002
|
||||
+++ kdesu/kdesu/kdesu.cpp Thu Jan 9 23:22:00 2003
|
||||
@@ -266,10 +266,12 @@ int main(int argc, char *argv[])
|
||||
KConfig *config = KGlobal::config();
|
||||
config->setGroup("Passwords");
|
||||
int timeout = config->readNumEntry("Timeout", defTimeout);
|
||||
@ -14,7 +14,7 @@ $OpenBSD: patch-kdesu_kdesu_kdesu_cpp,v 1.1 2003/01/07 00:19:34 espie Exp $
|
||||
int needpw = proc.checkNeedPassword();
|
||||
if (needpw < 0)
|
||||
{
|
||||
@@ -288,7 +290,8 @@ int main(int argc, char *argv[])
|
||||
@@ -287,7 +289,8 @@ int main(int argc, char *argv[])
|
||||
QCString password;
|
||||
if (needpw)
|
||||
{
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-kdesu_kdesu_kdesu_cpp,v 1.1 2003/01/07 00:19:34 espie Exp $
|
||||
dlg->addLine(i18n("Command:"), command);
|
||||
if ((priority != 50) || (scheduler != SuProcess::SchedNormal))
|
||||
{
|
||||
@@ -327,6 +330,7 @@ int main(int argc, char *argv[])
|
||||
@@ -326,6 +329,7 @@ int main(int argc, char *argv[])
|
||||
proc.setTerminal(terminal);
|
||||
proc.setErase(true);
|
||||
proc.setUser(user);
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-kdm_kfrontend_Makefile_in,v 1.4 2003/01/07 00:19:34 espie Exp $
|
||||
--- kdm/kfrontend/Makefile.in.orig Tue Dec 17 11:46:39 2002
|
||||
+++ kdm/kfrontend/Makefile.in Sun Jan 5 23:56:47 2003
|
||||
@@ -754,8 +754,8 @@ uninstall-info: uninstall-info-recursive
|
||||
$OpenBSD: patch-kdm_kfrontend_Makefile_in,v 1.5 2003/01/27 19:22:50 espie Exp $
|
||||
--- kdm/kfrontend/Makefile.in.orig Fri Jan 3 18:14:56 2003
|
||||
+++ kdm/kfrontend/Makefile.in Thu Jan 9 23:27:00 2003
|
||||
@@ -786,8 +786,8 @@ uninstall-info: uninstall-info-recursive
|
||||
|
||||
|
||||
install-data-local:
|
||||
install-data-local: genkdmconf
|
||||
- @$(mkinstalldirs) $(DESTDIR)$(kde_confdir)/kdm
|
||||
- @./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm
|
||||
+# @$(mkinstalldirs) $(DESTDIR)$(kde_confdir)/kdm
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-kioslave_man_man2html_cpp,v 1.6 2002/08/07 17:00:36 brad Exp $
|
||||
--- kioslave/man/man2html.cpp.orig Mon Jun 24 07:56:56 2002
|
||||
+++ kioslave/man/man2html.cpp Wed Aug 7 12:58:20 2002
|
||||
@@ -1681,6 +1681,7 @@ static const char *section_list[] = {
|
||||
$OpenBSD: patch-kioslave_man_man2html_cpp,v 1.7 2003/01/27 19:22:50 espie Exp $
|
||||
--- kioslave/man/man2html.cpp.orig Mon Oct 28 10:55:41 2002
|
||||
+++ kioslave/man/man2html.cpp Thu Jan 9 23:22:00 2003
|
||||
@@ -1691,6 +1691,7 @@ static const char *section_list[] = {
|
||||
"3L", "Lightweight Processes Library",
|
||||
"3M", "Mathematical Library",
|
||||
"3N", "Network Functions",
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-kioslave_man_man2html_cpp,v 1.6 2002/08/07 17:00:36 brad Exp $
|
||||
"3R", "RPC Services Library",
|
||||
"3S", "Standard I/O Functions",
|
||||
"3V", "C Library Functions",
|
||||
@@ -3367,16 +3368,17 @@ static char *scan_troff_mandoc(char *c,
|
||||
@@ -3390,16 +3391,17 @@ static char *scan_troff_mandoc(char *c,
|
||||
end++;
|
||||
}
|
||||
|
||||
|
12
x11/kde/base3/patches/patch-konsole_konsole_Makefile_in
Normal file
12
x11/kde/base3/patches/patch-konsole_konsole_Makefile_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-konsole_konsole_Makefile_in,v 1.3 2003/01/27 19:22:50 espie Exp $
|
||||
--- konsole/konsole/Makefile.in.orig Sun Jan 12 15:54:56 2003
|
||||
+++ konsole/konsole/Makefile.in Sun Jan 12 15:55:19 2003
|
||||
@@ -374,7 +374,7 @@ noinst_HEADERS = TEWidget.h TEPty.h TEmu
|
||||
|
||||
konsole_grantpty_SOURCES = konsole_grantpty.c
|
||||
konsole_grantpty_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
-konsole_grantpty_LDADD = -lkdefakes
|
||||
+konsole_grantpty_LDADD = -lkdefakes $(LIBUTIL)
|
||||
|
||||
# Not AUTO here, because there are some unused files
|
||||
#>- METASOURCES = TEWidget.moc TEmuVt102.moc session.moc konsole.moc konsole_child.moc \
|
121
x11/kde/base3/patches/patch-konsole_konsole_TEPty_cpp
Normal file
121
x11/kde/base3/patches/patch-konsole_konsole_TEPty_cpp
Normal file
@ -0,0 +1,121 @@
|
||||
$OpenBSD: patch-konsole_konsole_TEPty_cpp,v 1.3 2003/01/27 19:22:50 espie Exp $
|
||||
--- konsole/konsole/TEPty.cpp.orig Sun Jan 12 15:09:42 2003
|
||||
+++ konsole/konsole/TEPty.cpp Mon Jan 13 10:04:37 2003
|
||||
@@ -130,6 +130,9 @@
|
||||
#include <errno.h>
|
||||
#include <utmp.h>
|
||||
#endif
|
||||
+#ifdef __OpenBSD__
|
||||
+#undef USE_LOGIN
|
||||
+#endif
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
@@ -201,7 +204,13 @@ FILE* syslog_file = NULL; //stdout;
|
||||
#define PTY_FILENO 3
|
||||
#define BASE_CHOWN "konsole_grantpty"
|
||||
|
||||
-int chownpty(int fd, bool grant)
|
||||
+const int PTY_GRANT=0,
|
||||
+ PTY_REVOKE=1,
|
||||
+ PTY_LOGIN=2,
|
||||
+ PTY_LOGOUT=3;
|
||||
+
|
||||
+
|
||||
+int chownpty(int fd, int mode)
|
||||
// param fd: the fd of a master pty.
|
||||
// param grant: true to grant, false to revoke
|
||||
// returns 1 on success 0 on fail
|
||||
@@ -222,10 +231,25 @@ int chownpty(int fd, bool grant)
|
||||
}
|
||||
if (pid == 0)
|
||||
{
|
||||
+ const char *arg;
|
||||
/* We pass the master pseudo terminal as file descriptor PTY_FILENO. */
|
||||
if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1);
|
||||
QString path = locate("exe", BASE_CHOWN);
|
||||
- execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL);
|
||||
+ switch(mode) {
|
||||
+ case PTY_REVOKE:
|
||||
+ arg = "--revoke";
|
||||
+ break;
|
||||
+ case PTY_GRANT:
|
||||
+ arg = "--grant";
|
||||
+ break;
|
||||
+ case PTY_LOGIN:
|
||||
+ arg = "--login";
|
||||
+ break;
|
||||
+ case PTY_LOGOUT:
|
||||
+ arg = "--logout";
|
||||
+ break;
|
||||
+ }
|
||||
+ execle(path.ascii(), BASE_CHOWN, arg, NULL, NULL);
|
||||
exit(1); // should not be reached
|
||||
}
|
||||
|
||||
@@ -273,7 +297,7 @@ void TEPty::commClose()
|
||||
utmp.start(KProcess::Block);
|
||||
}
|
||||
#elif defined(USE_LOGIN)
|
||||
- char *tty_name=ttyname(0);
|
||||
+ char *tty_name=ttynam;
|
||||
if (tty_name)
|
||||
{
|
||||
if (strncmp(tty_name, "/dev/", 5) == 0)
|
||||
@@ -281,7 +305,10 @@ void TEPty::commClose()
|
||||
logout(tty_name);
|
||||
}
|
||||
#endif
|
||||
- if (m_bNeedGrantPty) chownpty(m_MasterFd, false);
|
||||
+#ifdef __OpenBSD__
|
||||
+ chownpty(m_MasterFd, PTY_LOGOUT);
|
||||
+#endif
|
||||
+ if (m_bNeedGrantPty) chownpty(m_MasterFd, PTY_REVOKE);
|
||||
|
||||
KProcess::commClose();
|
||||
}
|
||||
@@ -357,7 +384,7 @@ void TEPty::openPty()
|
||||
// be opened by several different methods.
|
||||
|
||||
// We try, as we know them, one by one.
|
||||
-#if defined(HAVE_OPENPTY) //FIXME: some work needed.
|
||||
+#if defined(HAVE_OPENPTY) && !defined(__OpenBSD__) //FIXME: some work needed.
|
||||
if (m_MasterFd < 0) {
|
||||
int master_fd, slave_fd;
|
||||
if (openpty(&master_fd, &slave_fd, NULL, NULL, NULL) == 0) {
|
||||
@@ -453,7 +480,7 @@ void TEPty::openPty()
|
||||
return;
|
||||
}
|
||||
|
||||
- if (m_bNeedGrantPty && !chownpty(m_MasterFd, true))
|
||||
+ if (m_bNeedGrantPty && !chownpty(m_MasterFd, PTY_GRANT))
|
||||
{
|
||||
fprintf(stderr,"konsole: chownpty failed for device %s::%s.\n",ptynam,ttynam);
|
||||
fprintf(stderr," : This means the session can be eavesdroped.\n");
|
||||
@@ -462,7 +489,6 @@ void TEPty::openPty()
|
||||
KGlobal::dirs()->findResourceDir("exe",
|
||||
"konsole").local8Bit().data());
|
||||
}
|
||||
-
|
||||
fcntl(m_MasterFd,F_SETFL,O_NDELAY);
|
||||
}
|
||||
|
||||
@@ -530,7 +556,7 @@ int TEPty::makePty(bool _addutmp)
|
||||
l_struct.ut_host[UT_HOSTSIZE]=0;
|
||||
}
|
||||
|
||||
- if (! (str_ptr=ttyname(tt)) ) {
|
||||
+ if (! (str_ptr=ttyname(tt)) && !(str_ptr=ttynam)) {
|
||||
abort();
|
||||
}
|
||||
if (strncmp(str_ptr, "/dev/", 5) == 0)
|
||||
@@ -539,6 +565,9 @@ int TEPty::makePty(bool _addutmp)
|
||||
time(&l_struct.ut_time);
|
||||
|
||||
login(&l_struct);
|
||||
+#endif
|
||||
+#ifdef __OpenBSD__
|
||||
+ chownpty(tt, PTY_LOGIN);
|
||||
#endif
|
||||
return tt;
|
||||
}
|
12
x11/kde/base3/patches/patch-konsole_konsole_TEPty_h
Normal file
12
x11/kde/base3/patches/patch-konsole_konsole_TEPty_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-konsole_konsole_TEPty_h,v 1.3 2003/01/27 19:22:50 espie Exp $
|
||||
--- konsole/konsole/TEPty.h.orig Sun Jan 12 15:16:31 2003
|
||||
+++ konsole/konsole/TEPty.h Sun Jan 12 15:17:28 2003
|
||||
@@ -130,7 +130,7 @@ Q_OBJECT
|
||||
QValueList<SendJob> pendingSendJobs;
|
||||
QTimer* pSendJobTimer;
|
||||
|
||||
- friend int chownpty(int, bool);
|
||||
+ friend int chownpty(int, int);
|
||||
};
|
||||
|
||||
#endif
|
@ -0,0 +1,89 @@
|
||||
$OpenBSD: patch-konsole_konsole_konsole_grantpty_c,v 1.3 2003/01/27 19:22:50 espie Exp $
|
||||
--- konsole/konsole/konsole_grantpty.c.orig Sun Jan 12 15:24:11 2003
|
||||
+++ konsole/konsole/konsole_grantpty.c Mon Jan 13 10:02:31 2003
|
||||
@@ -39,10 +39,64 @@
|
||||
# include <paths.h>
|
||||
# include <dirent.h>
|
||||
#endif
|
||||
+#ifdef HAVE_LIBUTIL_H
|
||||
+ #include <libutil.h>
|
||||
+#elif defined(HAVE_UTIL_H)
|
||||
+ #include <util.h>
|
||||
+#endif
|
||||
+#include <utmp.h>
|
||||
+
|
||||
|
||||
#define PTY_FILENO 3 /* keep in sync with grantpty */
|
||||
#define TTY_GROUP "tty"
|
||||
|
||||
+int perform_login()
|
||||
+{
|
||||
+ char *str_ptr;
|
||||
+ struct utmp l_struct;
|
||||
+ memset(&l_struct, 0, sizeof(struct utmp));
|
||||
+
|
||||
+ if (dup2(PTY_FILENO, 0) == -1)
|
||||
+ return 1;
|
||||
+ if (! (str_ptr=getlogin()) ) {
|
||||
+ if ( ! (str_ptr=getenv("LOGNAME"))) {
|
||||
+ return 1;
|
||||
+ }
|
||||
+ }
|
||||
+ strncpy(l_struct.ut_name, str_ptr, UT_NAMESIZE);
|
||||
+
|
||||
+ if (gethostname(l_struct.ut_host, UT_HOSTSIZE) == -1) {
|
||||
+ if (errno != ENOMEM)
|
||||
+ return 1;
|
||||
+ l_struct.ut_host[UT_HOSTSIZE]=0;
|
||||
+ }
|
||||
+
|
||||
+ if (! (str_ptr=ttyname(PTY_FILENO)))
|
||||
+ return 1;
|
||||
+ if (strncmp(str_ptr, "/dev/", 5) == 0)
|
||||
+ str_ptr += 5;
|
||||
+ strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE);
|
||||
+ time(&l_struct.ut_time);
|
||||
+
|
||||
+ login(&l_struct);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int perform_logout()
|
||||
+{
|
||||
+ char *tty_name=ttyname(PTY_FILENO);
|
||||
+ if (tty_name)
|
||||
+ {
|
||||
+ if (strncmp(tty_name, "/dev/", 5) == 0)
|
||||
+ tty_name += 5;
|
||||
+ if (*tty_name == 'p')
|
||||
+ *tty_name = 't';
|
||||
+ logout(tty_name);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
char* pty;
|
||||
@@ -54,7 +108,7 @@ int main (int argc, char *argv[])
|
||||
char* tty;
|
||||
|
||||
/* check preconditions **************************************************/
|
||||
- if (argc != 2 || (strcmp(argv[1],"--grant") && strcmp(argv[1],"--revoke")))
|
||||
+ if (argc != 2 || (strcmp(argv[1],"--grant") && strcmp(argv[1],"--revoke") && strcmp(argv[1], "--login") && strcmp(argv[1], "--logout")))
|
||||
{
|
||||
printf("usage: %s (--grant|--revoke)\n",argv[0]);
|
||||
printf("%s is a helper for\n",argv[0]);
|
||||
@@ -70,6 +124,11 @@ int main (int argc, char *argv[])
|
||||
fprintf(stderr,"%s not installed root-suid\n",argv[0]);
|
||||
return 1; /* FAIL */
|
||||
}
|
||||
+
|
||||
+ if (!strcmp(argv[1], "--login"))
|
||||
+ return perform_login();
|
||||
+ if (!strcmp(argv[1], "--logout"))
|
||||
+ return perform_logout();
|
||||
|
||||
/* setup parameters for the operation ***********************************/
|
||||
|
@ -1,13 +1,32 @@
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_CPU_c,v 1.1 2003/01/09 02:47:40 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Thu Jan 3 21:30:02 2002
|
||||
+++ ksysguard/ksysguardd/FreeBSD/CPU.c Thu Jan 9 01:23:42 2003
|
||||
@@ -19,7 +19,9 @@
|
||||
*/
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_CPU_c,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Thu Dec 5 21:41:06 2002
|
||||
+++ ksysguard/ksysguardd/FreeBSD/CPU.c Tue Jan 14 15:50:07 2003
|
||||
@@ -22,9 +22,12 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/dkstat.h>
|
||||
+#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
#include <devstat.h>
|
||||
+#endif
|
||||
#include <fcntl.h>
|
||||
#include <kvm.h>
|
||||
#include <nlist.h>
|
||||
#include <stdio.h>
|
||||
@@ -68,7 +71,15 @@ exitCpuInfo(void)
|
||||
int
|
||||
updateCpuInfo(void)
|
||||
{
|
||||
+#ifdef __OpenBSD__
|
||||
+ int mib[2];
|
||||
+ mib[0] = CTL_KERN;
|
||||
+ mib[1] = KERN_CPTIME;
|
||||
+ sysctl(mib, 2, &cp_time, sizeof(cp_time), NULL, 0);
|
||||
+#endif
|
||||
+#ifdef __FreeBSD__
|
||||
sysctlbyname("kern.cp_time", &cp_time, sizeof(cp_time), NULL, 0);
|
||||
+#endif
|
||||
percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
|
||||
return (0);
|
||||
}
|
||||
|
@ -1,24 +1,27 @@
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_Memory_c,v 1.1 2003/01/09 02:47:40 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 23:11:20 2001
|
||||
+++ ksysguard/ksysguardd/FreeBSD/Memory.c Thu Jan 9 01:23:54 2003
|
||||
@@ -32,7 +32,11 @@
|
||||
#include <sys/types.h>
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_Memory_c,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Sun Oct 27 00:07:11 2002
|
||||
+++ ksysguard/ksysguardd/FreeBSD/Memory.c Tue Jan 14 15:47:47 2003
|
||||
@@ -26,7 +26,11 @@
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/vmmeter.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <sys/swap.h>
|
||||
+#else
|
||||
#include <vm/vm_param.h>
|
||||
+#endif
|
||||
|
||||
#include "Command.h"
|
||||
#include "Memory.h"
|
||||
@@ -82,15 +86,42 @@ updateMemory(void)
|
||||
#include <fcntl.h>
|
||||
#include <kvm.h>
|
||||
@@ -83,15 +87,45 @@ updateMemory(void)
|
||||
struct vmtotal p;
|
||||
FILE *file;
|
||||
char buf[256];
|
||||
+#ifdef __FreeBSD__
|
||||
struct kvm_swap kswap[16];
|
||||
+#endif
|
||||
+#ifdef __OpenBSD__
|
||||
+ int mib[2];
|
||||
+#endif
|
||||
int i, swap_count, hlen, pagesize = getpagesize();
|
||||
long blocksize;
|
||||
@ -56,7 +59,7 @@ $OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_Memory_c,v 1.1 2003/01/09 02:47:40
|
||||
swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX);
|
||||
getbsize(&hlen, &blocksize);
|
||||
|
||||
@@ -101,22 +132,33 @@ updateMemory(void)
|
||||
@@ -102,22 +136,33 @@ updateMemory(void)
|
||||
SUsed = CONVERT(kswap[0].ksw_used);
|
||||
SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used);
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_apm_c,v 1.1 2003/01/09 02:47:40 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/apm.c.orig Thu Jan 9 01:24:30 2003
|
||||
+++ ksysguard/ksysguardd/FreeBSD/apm.c Thu Jan 9 01:27:04 2003
|
||||
@@ -20,7 +20,11 @@
|
||||
*/
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_apm_c,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/apm.c.orig Sun Oct 27 00:07:11 2002
|
||||
+++ ksysguard/ksysguardd/FreeBSD/apm.c Thu Jan 9 23:22:01 2003
|
||||
@@ -23,7 +23,11 @@
|
||||
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <machine/apmvar.h>
|
||||
@ -13,7 +13,7 @@ $OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_apm_c,v 1.1 2003/01/09 02:47:40 esp
|
||||
#include <stdio.h>
|
||||
|
||||
#include "Command.h"
|
||||
@@ -59,6 +63,22 @@ exitApm(void)
|
||||
@@ -62,6 +66,22 @@ exitApm(void)
|
||||
close(ApmFD);
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ $OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_apm_c,v 1.1 2003/01/09 02:47:40 esp
|
||||
int
|
||||
updateApm(void)
|
||||
{
|
||||
@@ -72,6 +92,7 @@ updateApm(void)
|
||||
@@ -75,6 +95,7 @@ updateApm(void)
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_netdev_c,v 1.1 2003/01/09 02:47:40 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Thu Jan 9 01:27:29 2003
|
||||
+++ ksysguard/ksysguardd/FreeBSD/netdev.c Thu Jan 9 01:29:21 2003
|
||||
$OpenBSD: patch-ksysguard_ksysguardd_FreeBSD_netdev_c,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Thu Dec 5 21:41:07 2002
|
||||
+++ ksysguard/ksysguardd/FreeBSD/netdev.c Thu Jan 9 23:22:01 2003
|
||||
@@ -19,6 +19,7 @@
|
||||
$Id: patch-ksysguard_ksysguardd_FreeBSD_netdev_c,v 1.1 2003/01/09 02:47:40 espie Exp $
|
||||
$Id: patch-ksysguard_ksysguardd_FreeBSD_netdev_c,v 1.2 2003/01/27 19:22:50 espie Exp $
|
||||
*/
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sysctl.h>
|
||||
@@ -317,3 +318,9 @@ void printNetDevSentBytesInfo(const char
|
||||
@@ -321,3 +322,9 @@ void printNetDevSentBytesInfo(const char
|
||||
if (!strncmp(retval[1], "collisions", 10))
|
||||
fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n");
|
||||
}
|
||||
|
26
x11/kde/base3/patches/patch-kxkb_Makefile_in
Normal file
26
x11/kde/base3/patches/patch-kxkb_Makefile_in
Normal file
@ -0,0 +1,26 @@
|
||||
$OpenBSD: patch-kxkb_Makefile_in,v 1.1 2003/01/27 19:22:50 espie Exp $
|
||||
--- kxkb/Makefile.in.orig Wed Jan 22 18:43:05 2003
|
||||
+++ kxkb/Makefile.in Wed Jan 22 18:43:18 2003
|
||||
@@ -295,7 +295,7 @@ bin_PROGRAMS = kxkb
|
||||
|
||||
kxkb_SOURCES = dummy.cpp
|
||||
kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
-kxkb_LDADD = kxkb.la -lxkbfile
|
||||
+kxkb_LDADD = kxkb.la -lxkbfile_pic
|
||||
|
||||
lib_LTLIBRARIES = kxkb.la
|
||||
kde_module_LTLIBRARIES = kcm_keyboard.la
|
||||
@@ -304,11 +304,11 @@ kde_module_LTLIBRARIES = kcm_keyboard.la
|
||||
#>+ 1
|
||||
kcm_keyboard_la_SOURCES=rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.cpp
|
||||
kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
|
||||
-kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile
|
||||
+kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile_pic
|
||||
|
||||
kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp
|
||||
kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||
-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile
|
||||
+kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile_pic
|
||||
|
||||
data_DATA = keyboard.desktop
|
||||
data2_DATA = keyboard_layout.desktop
|
@ -1,29 +1,34 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.9 2003/01/09 02:47:40 espie Exp $
|
||||
${KDE}/libchildpanel_panelextension.so.1.0
|
||||
${KDE}/libclock_panelapplet.so.1.0
|
||||
${KDE}/libdockbar_panelextension.so.1.0
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.10 2003/01/27 19:22:50 espie Exp $
|
||||
${KDE}/libchildpanel_panelextension.so.0.0
|
||||
${KDE}/libclock_panelapplet.so.0.0
|
||||
${KDE}/libdockbar_panelextension.so.0.0
|
||||
${KDE}/libgsthumbnail.so.0.0
|
||||
${KDE}/libhtmlthumbnail.so.0.0
|
||||
${KDE}/libimagethumbnail.so.0.0
|
||||
${KDE}/libkasbar_panelextension.so.1.0
|
||||
${KDE}/libkasbar_panelextension.so.0.0
|
||||
${KDE}/libkcm_access.so.0.0
|
||||
${KDE}/libkcm_arts.so.0.0
|
||||
${KDE}/libkcm_audiocd.so.0.0
|
||||
${KDE}/libkcm_background.so.0.0
|
||||
${KDE}/libkcm_bell.so.0.0
|
||||
${KDE}/libkcm_cgi.so.0.0
|
||||
${KDE}/libkcm_clock.so.0.0
|
||||
${KDE}/libkcm_colors.so.0.0
|
||||
${KDE}/libkcm_componentchooser.so.0.0
|
||||
${KDE}/libkcm_crypto.so.0.0
|
||||
${KDE}/libkcm_css.so.0.0
|
||||
${KDE}/libkcm_email.so.0.0
|
||||
${KDE}/libkcm_energy.so.0.0
|
||||
${KDE}/libkcm_fileshare.so.0.0
|
||||
${KDE}/libkcm_filetypes.so.0.0
|
||||
${KDE}/libkcm_fontinst.so.0.0
|
||||
${KDE}/libkcm_fonts.so.0.0
|
||||
${KDE}/libkcm_helpcenter.so.0.0
|
||||
${KDE}/libkcm_history.so.0.0
|
||||
${KDE}/libkcm_icons.so.0.0
|
||||
${KDE}/libkcm_info.so.0.0
|
||||
${KDE}/libkcm_input.so.0.0
|
||||
${KDE}/libkcm_ioslaveinfo.so.0.0
|
||||
${KDE}/libkcm_kded.so.0.0
|
||||
${KDE}/libkcm_kdm.so.0.0
|
||||
${KDE}/libkcm_keyboard.so.0.0
|
||||
${KDE}/libkcm_keys.so.0.0
|
||||
@ -39,31 +44,34 @@ ${KDE}/libkcm_kwindecoration.so.0.0
|
||||
${KDE}/libkcm_kwinoptions.so.0.0
|
||||
${KDE}/libkcm_launch.so.0.0
|
||||
${KDE}/libkcm_locale.so.0.0
|
||||
${KDE}/libkcm_midi.so.0.0
|
||||
${KDE}/libkcm_nic.so.0.0
|
||||
${KDE}/libkcm_passwords.so.0.0
|
||||
${KDE}/libkcm_printmgr.so.0.0
|
||||
${KDE}/libkcm_samba.so.0.0
|
||||
${KDE}/libkcm_screensaver.so.0.0
|
||||
${KDE}/libkcm_smserver.so.0.0
|
||||
${KDE}/libkcm_socks.so.0.0
|
||||
${KDE}/libkcm_spellchecking.so.0.0
|
||||
${KDE}/libkcm_style.so.0.0
|
||||
${KDE}/libkcm_taskbar.so.0.0
|
||||
${KDE}/libkcm_themes.so.0.0
|
||||
${KDE}/libkcm_usb.so.0.0
|
||||
${KDE}/libkded_favicons.so.0.0
|
||||
${KDE}/libkdeprint_part.so.0.0
|
||||
${KDE}/libkfile_font.so.0.0
|
||||
${KDE}/libkhelpcenter.so.0.0
|
||||
${KDE}/libkhelpcenterpart.so.0.0
|
||||
${KDE}/libkickermenu_kdeprint.so.0.0
|
||||
${KDE}/libkio_audiocd.so.0.0
|
||||
${KDE}/libkickermenu_konsole.so.0.0
|
||||
${KDE}/libkickermenu_prefmenu.so.0.0
|
||||
${KDE}/libkickermenu_recentdocs.so.0.0
|
||||
${KDE}/libkio_about.so.0.0
|
||||
${KDE}/libkio_cgi.so.0.0
|
||||
${KDE}/libkio_filter.so.0.0
|
||||
${KDE}/libkio_finger.so.0.0
|
||||
${KDE}/libkio_fish.so.0.0
|
||||
${KDE}/libkio_floppy.so.0.0
|
||||
${KDE}/libkio_imap4.so.0.0
|
||||
${KDE}/libkio_info.so.0.0
|
||||
${KDE}/libkio_ldap.so.0.0
|
||||
${KDE}/libkio_mac.so.0.0
|
||||
${KDE}/libkio_man.so.0.0
|
||||
${KDE}/libkio_nfs.so.0.0
|
||||
${KDE}/libkio_nntp.so.0.0
|
||||
@ -74,7 +82,9 @@ ${KDE}/libkio_smb.so.0.0
|
||||
${KDE}/libkio_smtp.so.0.0
|
||||
${KDE}/libkio_tar.so.0.0
|
||||
${KDE}/libkio_thumbnail.so.0.0
|
||||
${KDE}/libkio_zip.so.0.0
|
||||
${KDE}/libklipper_panelapplet.so.0.0
|
||||
${KDE}/libkmanpart.so.0.0
|
||||
${KDE}/libkonq_aboutpage.so.0.0
|
||||
${KDE}/libkonq_iconview.so.0.0
|
||||
${KDE}/libkonq_listview.so.0.0
|
||||
@ -85,6 +95,7 @@ ${KDE}/libkonq_sidebartree_dirtree.so.0.0
|
||||
${KDE}/libkonq_sidebartree_history.so.0.0
|
||||
${KDE}/libkonq_sound.so.0.0
|
||||
${KDE}/libkonqsidebar_tree.so.0.0
|
||||
${KDE}/libkonsolepart.so.0.0
|
||||
${KDE}/libkshorturifilter.so.0.0
|
||||
${KDE}/libkuriikwsfilter.so.0.0
|
||||
${KDE}/libkurisearchfilter.so.0.0
|
||||
@ -95,6 +106,8 @@ ${KDE}/libkwin_default_config.so.0.0
|
||||
${KDE}/libkwin_icewm.so.0.0
|
||||
${KDE}/libkwin_icewm_config.so.0.0
|
||||
${KDE}/libkwin_kde1.so.0.0
|
||||
${KDE}/libkwin_keramik.so.0.0
|
||||
${KDE}/libkwin_keramik_config.so.0.0
|
||||
${KDE}/libkwin_kstep.so.0.0
|
||||
${KDE}/libkwin_kwmtheme.so.0.0
|
||||
${KDE}/libkwin_laptop.so.0.0
|
||||
@ -106,15 +119,17 @@ ${KDE}/libkwin_redmond.so.0.0
|
||||
${KDE}/libkwin_riscos.so.0.0
|
||||
${KDE}/libkwin_system.so.0.0
|
||||
${KDE}/libkwin_web.so.0.0
|
||||
${KDE}/liblauncher_panelapplet.so.1.0
|
||||
${KDE}/liblauncher_panelapplet.so.0.0
|
||||
${KDE}/liblocaldomainurifilter.so.0.0
|
||||
${KDE}/liblockout_panelapplet.so.0.0
|
||||
${KDE}/libminipager_panelapplet.so.1.0
|
||||
${KDE}/libnaughty_panelapplet.so.1.0
|
||||
${KDE}/librun_panelapplet.so.1.0
|
||||
${KDE}/libsysguard_panelapplet.so.1.0
|
||||
${KDE}/libsystemtray_panelapplet.so.1.0
|
||||
${KDE}/libtaskbar_panelapplet.so.1.0
|
||||
${KDE}/libtaskbar_panelextension.so.1.0
|
||||
${KDE}/libminipager_panelapplet.so.0.0
|
||||
${KDE}/libnaughty_panelapplet.so.0.0
|
||||
${KDE}/libpicturethumbnail.so.0.0
|
||||
${KDE}/librun_panelapplet.so.0.0
|
||||
${KDE}/libsysguard_panelapplet.so.0.0
|
||||
${KDE}/libsystemtray_panelapplet.so.0.0
|
||||
${KDE}/libtaskbar_panelapplet.so.0.0
|
||||
${KDE}/libtaskbar_panelextension.so.0.0
|
||||
${KDE}/libtextthumbnail.so.0.0
|
||||
lib/libappletproxy.so.0.0
|
||||
lib/libextensionproxy.so.0.0
|
||||
@ -134,12 +149,13 @@ lib/libkickermain.so.1.0
|
||||
lib/libkjobviewer.so.0.0
|
||||
lib/libklipper.so.0.0
|
||||
lib/libkmenuedit.so.0.0
|
||||
lib/libkonq.so.4.0
|
||||
lib/libkmultitabbar.so.0.0
|
||||
lib/libkonq.so.5.0
|
||||
lib/libkonq_sidebar_tree.so.0.0
|
||||
lib/libkonqsidebarplugin.so.0.0
|
||||
lib/libkonqueror.so.0.0
|
||||
lib/libkonsole.so.0.0
|
||||
lib/libkonsolepart.so.0.0
|
||||
lib/libkprinter.so.0.0
|
||||
lib/libksgrd.so.0.0
|
||||
lib/libksmserver.so.0.0
|
||||
lib/libkwin.so.0.0
|
||||
@ -147,6 +163,6 @@ lib/libkwrite.so.0.0
|
||||
lib/libkwrited.so.0.0
|
||||
lib/libkxkb.so.0.0
|
||||
lib/libsensordisplays.so.0.0
|
||||
lib/libtaskbar.so.1.0
|
||||
lib/libtaskbar.so.2.0
|
||||
lib/libtaskmanager.so.1.0
|
||||
DYNLIBDIR(%D/lib)
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user