Francois Andriot
12 years ago
parent
4398af173f
commit
b566058ccb
@ -0,0 +1,90 @@
|
||||
# Default version for this component
|
||||
%if "%{?version}" == ""
|
||||
%define kdecomp compizconfig-backend-kconfig
|
||||
%define version 3.5.12
|
||||
%endif
|
||||
%define release 1
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%define _docdir %{tde_prefix}/share/doc
|
||||
%endif
|
||||
|
||||
# TDE 3.5.12 specific building variables
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
%define tde_docdir %{_docdir}
|
||||
%define tde_libdir %{tde_libdir}/kde3
|
||||
|
||||
|
||||
Name: trinity-%{?kdecomp}
|
||||
Version: %{?version}
|
||||
Release: %{?release}%{?dist}%{?_variant}
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
Summary: kconfig backend for compizconfig
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: GPLv2+
|
||||
URL: http://www.opencompositing.org
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
|
||||
Source0: %{kdecomp}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
BuildRequires: libcompizconfig-devel intltool
|
||||
Requires: compiz
|
||||
|
||||
|
||||
%description
|
||||
The Compiz Fusion Project brings 3D desktop visual effects that improve
|
||||
usability of the X Window System and provide increased productivity
|
||||
through plugins and themes contributed by the community giving a
|
||||
rich desktop experience.
|
||||
|
||||
This package contains the kconfig backend for libcompizconfig
|
||||
|
||||
%prep
|
||||
%setup -q -n applications/%{kdecomp}
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f admin/Makefile.common
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--with-extra-includes=%{tde_includedir}/tqt
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{?buildroot}
|
||||
%make_install
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{?buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING.GPL COPYING.LGPL
|
||||
%{_usr}/%{_lib}/compizconfig/backends/*.so
|
||||
%exclude %{_usr}/%{_lib}/compizconfig/backends/*.la
|
||||
|
||||
%changelog
|
||||
* Tue Sep 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
||||
- Initial package
|
||||
- Import to GIT
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -0,0 +1,140 @@
|
||||
--- baghira-0.8/bab/main.cpp.ORI 2012-11-20 19:33:04.093794934 +0100
|
||||
+++ baghira-0.8/bab/main.cpp 2012-11-20 19:33:08.022717622 +0100
|
||||
@@ -330,7 +330,7 @@
|
||||
delete config;
|
||||
}
|
||||
|
||||
-QPoint *BabSwitcher::globalPos = new QPoint::QPoint(0,0);
|
||||
+QPoint *BabSwitcher::globalPos = new QPoint(0,0);
|
||||
|
||||
BabSwitcher::BabSwitcher(bab *parent, const char *name)
|
||||
: KSystemTray(parent,name), DCOPObject("babInterface") {
|
||||
--- baghira-0.8/bab/Makefile.am.ORI 2012-11-20 19:34:26.540172464 +0100
|
||||
+++ baghira-0.8/bab/Makefile.am 2012-11-20 19:34:35.265000752 +0100
|
||||
@@ -19,4 +19,4 @@
|
||||
# the application source, library search path, and link libraries
|
||||
bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel
|
||||
bab_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
-bab_LDADD = $(LIB_KDEUI)
|
||||
+bab_LDADD = $(LIB_KDEUI) $(LIB_QT)
|
||||
--- baghira-0.8/config/generatePixmaps.sh.OLD 2012-11-20 19:53:24.431860823 +0100
|
||||
+++ baghira-0.8/config/generatePixmaps.sh 2012-11-20 19:53:47.753402165 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
top_srcdir="${1:-../..}"
|
||||
imagebase="$top_srcdir/imagebase"
|
||||
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
|
||||
+UIC=$QTDIR/bin/uic
|
||||
echo -e "#ifndef SCPIXMAPS_H\n#define SCPIXMAPS_H\n" > pixmaps.h
|
||||
$UIC -embed baghira \
|
||||
$imagebase/button-base \
|
||||
--- baghira-0.8/config/Makefile.am.ORI 2012-11-20 19:55:33.699318284 +0100
|
||||
+++ baghira-0.8/config/Makefile.am 2012-11-20 19:55:37.841236807 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
|
||||
# kstyle_baghira_config_la_METASOURCES = AUTO
|
||||
-kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
|
||||
+kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP
|
||||
kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN)
|
||||
|
||||
|
||||
--- baghira-0.8/deco/config/generatePixmaps.sh.ORI 2012-11-20 19:59:34.835573683 +0100
|
||||
+++ baghira-0.8/deco/config/generatePixmaps.sh 2012-11-20 19:59:45.590362018 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
top_srcdir="${1:-../..}"
|
||||
imagebase="$top_srcdir/imagebase"
|
||||
-UIC=$(grep "UIC = " ../../Makefile | cut -f3- -d" ")
|
||||
+UIC=$QTDIR/bin/uic
|
||||
echo -e "#ifndef DCPIXMAPS_H\n#define DCPIXMAPS_H\n" > pixmaps.h
|
||||
$UIC -embed baghira \
|
||||
$imagebase/icon_help \
|
||||
--- baghira-0.8/deco/config/Makefile.am.ORI 2012-11-20 20:00:37.549339366 +0100
|
||||
+++ baghira-0.8/deco/config/Makefile.am 2012-11-20 20:00:50.370087013 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
kde_module_LTLIBRARIES = kwin_baghira_config.la
|
||||
kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
|
||||
kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
-kwin_baghira_config_la_LIBADD = $(LIB_KDEUI)
|
||||
+kwin_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
|
||||
kwin_baghira_config_la_METASOURCES = AUTO
|
||||
|
||||
DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES)
|
||||
--- baghira-0.8/deco/generatePixmaps.sh.ORI 2012-11-20 20:03:20.543131500 +0100
|
||||
+++ baghira-0.8/deco/generatePixmaps.sh 2012-11-20 20:03:29.464956023 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
top_srcdir="${1:-../..}"
|
||||
imagebase="$top_srcdir/imagebase"
|
||||
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
|
||||
+UIC=$QTDIR/bin/uic
|
||||
echo -e "#ifndef DPIXMAPS_H\n#define DPIXMAPS_H\n" > pixmaps.h
|
||||
$UIC -embed baghira \
|
||||
$imagebase/brushed-gradient \
|
||||
--- baghira-0.8/deco/Makefile.am.ORI 2012-11-20 20:04:20.899944322 +0100
|
||||
+++ baghira-0.8/deco/Makefile.am 2012-11-20 20:04:44.230485387 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
kde_module_LTLIBRARIES = kwin3_baghira.la
|
||||
kwin3_baghira_la_SOURCES = baghiraclient.cc
|
||||
kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
|
||||
-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module
|
||||
+kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
|
||||
kwin3_baghira_la_METASOURCES = AUTO
|
||||
|
||||
DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
|
||||
--- baghira-0.8/sessionapplet/dmctl.cpp~ 2005-07-11 21:23:58.000000000 +0200
|
||||
+++ baghira-0.8/sessionapplet/dmctl.cpp 2012-11-20 20:16:58.925023092 +0100
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
DM::DM() : fd( -1 )
|
||||
{
|
||||
- char *ptr;
|
||||
+ const char *ptr;
|
||||
struct sockaddr_un sa;
|
||||
|
||||
if (DMType == Dunno) {
|
||||
--- baghira-0.8/style/generatePixmaps.sh.ORI 2012-11-20 20:20:08.024297835 +0100
|
||||
+++ baghira-0.8/style/generatePixmaps.sh 2012-11-20 20:20:22.149019999 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
top_srcdir="${1:-../..}"
|
||||
imagebase="$top_srcdir/imagebase"
|
||||
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
|
||||
+UIC=$QTDIR/bin/uic
|
||||
echo -e "#ifndef SPIXMAPS_H\n#define SPIXMAPS_H\n" > pixmaps.h
|
||||
$UIC -embed baghira \
|
||||
$imagebase/brushed-gradient \
|
||||
--- baghira-0.8/style/Makefile.am.ORI 2012-11-20 20:21:23.703809116 +0100
|
||||
+++ baghira-0.8/style/Makefile.am 2012-11-20 20:21:34.795590907 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
METASOURCES = AUTO
|
||||
kde_style_LTLIBRARIES = baghira.la
|
||||
baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
-baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI)
|
||||
+baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
|
||||
baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp
|
||||
lnkdir = $(kde_datadir)/kstyle/themes
|
||||
lnk_DATA = baghira.themerc
|
||||
--- baghira-0.8/kickermenu/Makefile.am.ORI 2012-11-20 20:23:35.843209238 +0100
|
||||
+++ baghira-0.8/kickermenu/Makefile.am 2012-11-20 20:23:41.101105774 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
b_menu_panelapplet_la_METASOURCES = AUTO
|
||||
|
||||
b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
|
||||
-b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI)
|
||||
+b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
|
||||
|
||||
messages:
|
||||
$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
|
||||
--- baghira-0.8/sidebar/Makefile.am.ORI 2012-11-20 20:25:55.797454906 +0100
|
||||
+++ baghira-0.8/sidebar/Makefile.am 2012-11-20 20:26:05.393266033 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel
|
||||
konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
|
||||
-konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
|
||||
+konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
|
||||
|
||||
baghirasidebar_entry_DATA = baghirasidebar.desktop
|
||||
baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries
|
||||
@ -0,0 +1,107 @@
|
||||
--- bin/startkde.ORI 2012-11-16 20:44:01.763131101 +0100
|
||||
+++ bin/startkde 2012-11-16 21:24:12.865147976 +0100
|
||||
@@ -15,6 +15,26 @@
|
||||
source $HOME/.xprofile
|
||||
fi
|
||||
|
||||
+# Some functions to parse and check path correctly ...
|
||||
+is_in_path() {
|
||||
+ search="$1"; ifs="$IFS"; IFS=":"; set $PATH; IFS="$ifs"
|
||||
+ for i in $*; do
|
||||
+ [ "${i}" = "${search}" ] && return 0
|
||||
+ done
|
||||
+ return 1
|
||||
+}
|
||||
+
|
||||
+# Usage: place_before_in_path /opt/trinity/games /usr/games
|
||||
+place_before_in_path() {
|
||||
+ insert="$1"; before="$2"; ifs="$IFS"; IFS=":"; set $PATH; IFS="$ifs"
|
||||
+ NPATH=""
|
||||
+ for i in $*; do
|
||||
+ [ "${i}" = "${before}" ] && NPATH="${NPATH}:${insert}"
|
||||
+ NPATH="${NPATH}:${i}"
|
||||
+ done
|
||||
+ export PATH=${NPATH}
|
||||
+}
|
||||
+
|
||||
echo "[startkde] Starting startkde." 1>&2
|
||||
echo "[startkde] This script is $0" 1>&2
|
||||
|
||||
@@ -29,7 +49,7 @@
|
||||
# Do not use kde-config to determine the version. That command creates a
|
||||
# profile directory in the root of the file system. Refer to Bug Report 293.
|
||||
if [ -x $BIN_DIR/konqueror ]; then
|
||||
- KDE_VERSION="`$BIN_DIR/konqueror --version | grep KDE | awk '{print $2}'`"
|
||||
+ KDE_VERSION=$($BIN_DIR/konqueror --version | while IFS=: read a b; do [[ "$a" =~ "KDE" ]] && echo $b; done)
|
||||
echo "[startkde] TDE version is $KDE_VERSION" 1>&2
|
||||
export KDEDIR=${BIN_DIR%/bin}
|
||||
echo "[startkde] TDE base directory is $KDEDIR" 1>&2
|
||||
@@ -105,27 +125,12 @@
|
||||
# This script and kstandardirs.h and kstandardirs.cpp must match.
|
||||
# The latter two must be edited/patched before compiling.
|
||||
echo "[startkde] KDEHOME is not set." 1>&2
|
||||
- if [ -d $HOME/.trinity ]; then
|
||||
- # OK, this one is obvious.
|
||||
- export KDEHOME=$HOME/.trinity
|
||||
- elif [ -f /usr/bin/kde4-config ]; then
|
||||
- # Looks like KDE4 is installed.
|
||||
- if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
|
||||
- # Presume $HOME/.kde is being used for KDE4 as it already exists.
|
||||
- export KDEHOME=$HOME/.trinity
|
||||
- else
|
||||
- # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
|
||||
- export KDEHOME=$HOME/.trinity
|
||||
- fi
|
||||
- elif [ -f /opt/trinity/bin/kde-config ]; then
|
||||
- # Looks like Trinity is installed.
|
||||
- export KDEHOME=$HOME/.trinity
|
||||
- elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
|
||||
+ # Default value: $HOME/.trinity. Most users will use this.
|
||||
+ export KDEHOME=$HOME/.trinity
|
||||
+
|
||||
+ if [ ! -d $HOME/.trinity ] && [ ! -f /usr/bin/kde4-config ] && [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
|
||||
# Looks like Trinity is installed and not playing second fiddle to KDE4.
|
||||
export KDEHOME=$HOME/.kde
|
||||
- else
|
||||
- # Resort to this and hope for the best!
|
||||
- export KDEHOME=$HOME/.trinity
|
||||
fi
|
||||
echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
|
||||
fi
|
||||
@@ -149,30 +154,30 @@
|
||||
|
||||
# Modify the following environment variables only as necessary.
|
||||
if [ -d $KDEDIR/games ]; then
|
||||
- if [ "`echo $PATH | grep \"$KDEDIR/games\"`" = "" ]; then
|
||||
+ if ! is_in_path "$KDEDIR/games" ; then
|
||||
# Respect the traditional path order. Don't blindly place $KDEDIR/games
|
||||
# first in the path. Only place $KDEDIR/games before /usr/games. If packagers
|
||||
# are adding $KDEDIR/games elsewhere, then they need to ensure the traditional
|
||||
# search patch is respected.
|
||||
# Is there a way we can check that $KDEDIR/games is always placed only just before
|
||||
# /usr/games in the search path?
|
||||
- if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$\"`" != "" ]; then
|
||||
- export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/games\\(:.*\\)\\?$|\\1$KDEDIR/games:/usr/games\\2|\"`"
|
||||
+ if is_in_path "/usr/games"; then
|
||||
+ place_before_in_path "$KDEDIR/games" "/usr/games"
|
||||
else
|
||||
export PATH=$KDEDIR/games:$PATH
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [ -d $KDEDIR/bin ]; then
|
||||
- if [ "`echo $PATH | grep \"$KDEDIR/bin\"`" = "" ]; then
|
||||
+ if ! is_in_path "$KDEDIR/bin" ]; then
|
||||
# Respect the traditional path order. Don't blindly place $KDEDIR/bin
|
||||
# first in the path. Only place $KDEDIR/bin before /usr/bin. This order is
|
||||
# consistent with kdelibs/kdesu/stub.cpp. If packagers are adding $KDEDIR/bin
|
||||
# elsewhere, then they need to ensure the traditional search patch is respected.
|
||||
# Is there a way we can check that $KDEDIR/bin is always placed only just before
|
||||
# /usr/bin in the search path?
|
||||
- if [ "`echo $PATH | grep \"^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$\"`" != "" ]; then
|
||||
- export PATH="`echo $PATH | sed \"s|^\\(.*:\\)\\?/usr/bin\\(:.*\\)\\?$|\\1$KDEDIR/bin:/usr/bin\\2|\"`"
|
||||
+ if is_in_path "/usr/bin"; then
|
||||
+ place_before_in_path "$KDEDIR/bin" "/usr/bin"
|
||||
else
|
||||
export PATH=$KDEDIR/bin:$PATH
|
||||
fi
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.13.1/kdm/config.def.ORI 2012-12-01 12:45:04.820426652 +0100
|
||||
+++ kdebase-3.5.13.1/kdm/config.def 2012-12-01 12:45:16.291197270 +0100
|
||||
@@ -883,7 +883,7 @@
|
||||
Type: string
|
||||
Default: ""
|
||||
User: core
|
||||
-Instance: "/var/run/kdm.pid"
|
||||
+Instance: "/var/run/tdm.pid"
|
||||
Merge: xdm
|
||||
Comment:
|
||||
Where &kdm; should store its PID (do not store if empty).
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
@ -0,0 +1,7 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
auth required pam_permit.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
session optional pam_console.so
|
||||
@ -0,0 +1,8 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
auth required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
session optional pam_console.so
|
||||
session required pam_namespace.so
|
||||
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session include system-auth
|
||||
@ -0,0 +1,21 @@
|
||||
tdm_start_proc() {
|
||||
splashcopy 0 6
|
||||
# stop plymouth (bug#775548)
|
||||
plymouth_quit
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
tdm_vars() {
|
||||
TDM_BIN=/opt/trinity/bin/kdm
|
||||
case "${DISPLAYMANAGER##*/}" in
|
||||
tdm)
|
||||
export KDEROOTHOME=/root/.kdm
|
||||
DISPLAYMANAGER=$TDM_BIN
|
||||
STARTPROC=tdm_start_proc
|
||||
;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
return 0
|
||||
}
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
--- kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp.ORI 2012-12-29 11:25:06.736204632 +0100
|
||||
+++ kdelibs-3.5.13.1/kio/kio/tcpslavebase.cpp 2012-12-29 11:25:32.731669416 +0100
|
||||
@@ -853,10 +853,12 @@
|
||||
permacache = d->cc->isPermanent(pc);
|
||||
}
|
||||
|
||||
+/*
|
||||
if (!_IPmatchesCN && cp == KSSLCertificateCache::Accept) {
|
||||
cp = KSSLCertificateCache::Prompt;
|
||||
// ksv = KSSLCertificate::Ok;
|
||||
}
|
||||
+*/
|
||||
|
||||
// Precondition: cp is one of Reject, Accept or Prompt
|
||||
switch (cp) {
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,159 @@
|
||||
Index: b/cervisia/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/cervisia/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/cervisia/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -58,6 +58,24 @@
|
||||
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
||||
|
||||
|
||||
+macro( _pod2man )
|
||||
+ foreach( _pod ${ARGN} )
|
||||
+ add_custom_command(
|
||||
+ OUTPUT ${_pod}.1
|
||||
+ COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod}.pod > ${_pod}.1.in
|
||||
+ COMMAND
|
||||
+ sed -e 's%_KDEHTMLDIR_%'${HTML_INSTALL_DIR}'%g;'
|
||||
+ -e 's%_KDECONFDIR_%'${CONFIG_INSTALL_DIR}'%g;'
|
||||
+ < ${_pod}.1.in > ${_pod}.1
|
||||
+ DEPENDS ${_pod} )
|
||||
+ add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
|
||||
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
|
||||
+ endforeach( )
|
||||
+endmacro()
|
||||
+
|
||||
+_pod2man( cervisia )
|
||||
+
|
||||
+
|
||||
##### cervisia (static) #########################
|
||||
|
||||
tde_add_library( cervisia STATIC_PIC AUTOMOC
|
||||
Index: b/cervisia/cvsservice/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/cervisia/cvsservice/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/cervisia/cvsservice/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
tde_add_library( cvsservice SHARED AUTOMOC
|
||||
SOURCES
|
||||
cvsservice.stub cvsjob.stub repository.stub
|
||||
- VERSION 0.1.0
|
||||
+ VERSION 0.0.1
|
||||
LINK kdecore-shared
|
||||
DESTINATION ${LIB_INSTALL_DIR}
|
||||
)
|
||||
Index: b/kapptemplate/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/kapptemplate/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/kapptemplate/CMakeLists.txt 2012-11-05 23:56:28.000000000 +0100
|
||||
@@ -23,7 +23,11 @@
|
||||
|
||||
install( PROGRAMS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
|
||||
+ DESTINATION ${BIN_INSTALL_DIR} )
|
||||
+
|
||||
+install( PROGRAMS
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/mkinstalldirs
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
|
||||
|
||||
install( FILES
|
||||
kapptemplate.common kapptemplate.module
|
||||
|
||||
Index: b/kapptemplate/admin/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/kapptemplate/admin/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/kapptemplate/admin/CMakeLists.txt 2012-11-06 00:13:16.000000000 +0100
|
||||
@@ -9,4 +9,9 @@
|
||||
#
|
||||
#################################################
|
||||
|
||||
-tde_install_empty_directory( ${DATA_INSTALL_DIR}/kapptemplate/admin )
|
||||
+install(
|
||||
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
|
||||
+ DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
|
||||
+ USE_SOURCE_PERMISSIONS
|
||||
+ REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE
|
||||
+)
|
||||
Index: b/kmtrace/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/kmtrace/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/kmtrace/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -31,12 +31,16 @@
|
||||
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector
|
||||
DESTINATION ${BIN_INSTALL_DIR} )
|
||||
|
||||
+install( FILES ktrace.h
|
||||
+ DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
+)
|
||||
+
|
||||
|
||||
##### ktrace_s (static) #########################
|
||||
|
||||
tde_add_library( ktrace_s STATIC
|
||||
SOURCES ktrace.c
|
||||
- DESTINATION ${LIB_INSTALL_DIR}
|
||||
+ DESTINATION ${LIB_INSTALL_DIR}/kmtrace
|
||||
)
|
||||
|
||||
|
||||
Index: b/kompare/interfaces/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/kompare/interfaces/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/kompare/interfaces/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
tde_add_library( kompareinterface SHARED
|
||||
SOURCES kompareinterface.cpp
|
||||
+ VERSION 0.0.0
|
||||
LINK ${TQT_LIBRARIES}
|
||||
DESTINATION ${LIB_INSTALL_DIR}
|
||||
)
|
||||
Index: b/kunittest/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/kunittest/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/kunittest/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
tde_add_library( kunittestgui SHARED AUTOMOC
|
||||
SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
|
||||
+ VERSION 0.0.0
|
||||
LINK kunittest-shared
|
||||
DESTINATION ${LIB_INSTALL_DIR}
|
||||
)
|
||||
Index: b/scheck/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/scheck/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/scheck/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -30,5 +30,5 @@
|
||||
tde_add_kpart( scheck AUTOMOC
|
||||
SOURCES scheck.cpp
|
||||
LINK kdeui-shared
|
||||
- DESTINATION ${PLUGIN_INSTALL_DIR}
|
||||
+ DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
|
||||
)
|
||||
Index: b/scripts/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/scripts/CMakeLists.txt 2012-11-05 23:40:05.000000000 +0100
|
||||
+++ b/scripts/CMakeLists.txt 2012-11-05 23:41:26.000000000 +0100
|
||||
@@ -36,7 +36,7 @@
|
||||
COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_pod}.1
|
||||
DEPENDS ${_pod} )
|
||||
add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
|
||||
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR} )
|
||||
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
|
||||
endforeach( )
|
||||
endmacro()
|
||||
|
||||
Index: b/kapptemplate/admin/Makefile.am
|
||||
===================================================================
|
||||
--- a/kapptemplate/admin/Makefile.am 2012-11-06 00:36:24.000000000 +0100
|
||||
+++ b/kapptemplate/admin/Makefile.am 2012-11-06 00:48:24.000000000 +0100
|
||||
@@ -1,8 +1,8 @@
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
|
||||
for file in $(srcdir)/*; do \
|
||||
- if [ -f $$file -a $$file != 'Makefile' -a $$file != 'Makefile.in' -a $$file != 'Makefile.am' ]; then \
|
||||
- destfile=`basename $$file` \
|
||||
+ destfile=`basename $$file`; \
|
||||
+ if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' ]; then \
|
||||
$(INSTALL_DATA) $$file \
|
||||
$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
|
||||
fi \
|
||||
Loading…
Reference in new issue