Francois Andriot
12 years ago
parent
0dc6fc9495
commit
0ea769c229
@ -1,98 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
cd "$( dirname "$0" )"
|
|
||||||
|
|
||||||
# Default TDE version (if unspecified in 'components.txt')
|
|
||||||
DEFAULT_VERSION="3.5.12.99"
|
|
||||||
|
|
||||||
clear
|
|
||||||
cat <<EOF
|
|
||||||
This script generates a source tarball of TDE from the SVN/GIT repository.
|
|
||||||
Please choose a TDE component to archive or build.
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
|
|
||||||
##### CHOOSE A TDE COMPONENT #####
|
|
||||||
PS3="Enter number: "
|
|
||||||
select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do
|
|
||||||
ARCHIVEDIR="${PWD}/${COMP}"
|
|
||||||
[ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}"
|
|
||||||
|
|
||||||
VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
|
|
||||||
if [ -z "${VERSION}" ]; then VERSION=${DEFAULT_VERSION}; fi
|
|
||||||
|
|
||||||
# List existing tarballs
|
|
||||||
if ls ${ARCHIVEDIR}/${COMP##*/}*.tar.gz >/dev/null 2>&1; then
|
|
||||||
echo
|
|
||||||
echo "You currently have the following tarball(s): "
|
|
||||||
for i in ${ARCHIVEDIR}/${COMP##*/}*.tar.gz; do echo " ${i##*/}"; done
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Checks latest SVN revision
|
|
||||||
unset ARCHIVENAME
|
|
||||||
case "${COMP##*/}" in
|
|
||||||
"libcaldav"|"libcarddav"|"qt3") ;;
|
|
||||||
*)
|
|
||||||
SVNREV=$( LANG=C svn info svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface|sed -n "/^Revision: / s,.* \(.*\),\1,p" )
|
|
||||||
ARCHIVENAME=${COMP##*/}-${VERSION}.${SVNREV}.tar.gz
|
|
||||||
|
|
||||||
if [ -r ${ARCHIVEDIR}/${ARCHIVENAME} ]; then
|
|
||||||
echo "You already have the latest revision (${SVNREV})";
|
|
||||||
else
|
|
||||||
echo "A new revision is available: ${SVNREV}"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "Press ENTER to download the new tarball, or CTRL+C to abort."
|
|
||||||
read rep
|
|
||||||
|
|
||||||
TMPDIRTDE=$(mktemp -d)
|
|
||||||
pushd "${TMPDIRTDE}" >/dev/null
|
|
||||||
mkdir -p "${TMPDIRTDE}/${COMP}"
|
|
||||||
pushd "${COMP}/.." >/dev/null
|
|
||||||
case "${COMP##*/}" in
|
|
||||||
"libcaldav")
|
|
||||||
echo "Downloading '${COMP}' ..."
|
|
||||||
ARCHIVENAME="libcaldav_0.6.5-2debian2.tar.gz"
|
|
||||||
wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcaldav_0.6.5-2debian2.tar.gz"
|
|
||||||
;;
|
|
||||||
"libcarddav")
|
|
||||||
echo "Downloading '${COMP}' ..."
|
|
||||||
ARCHIVENAME="libcarddav_0.6.2-2debian2.tar.gz"
|
|
||||||
wget --no-check-certificate "https://quickbuild.pearsoncomputing.net/~trinity/+archive/trinity-builddeps/+files/libcarddav_0.6.2-2debian2.tar.gz"
|
|
||||||
;;
|
|
||||||
"qt3")
|
|
||||||
echo "Extracting '${COMP}' from GIT ..."
|
|
||||||
ARCHIVENAME="qt3-3.3.8d.tar.gz"
|
|
||||||
git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 .
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Extracting '${COMP}' from SVN ..."
|
|
||||||
svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ ! -r "${ARCHIVENAME}" ]; then
|
|
||||||
popd >/dev/null
|
|
||||||
echo "Creating archive '${ARCHIVENAME}' ..."
|
|
||||||
tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP}
|
|
||||||
else
|
|
||||||
mv *.tar.gz ${ARCHIVEDIR}/
|
|
||||||
popd >/dev/null
|
|
||||||
fi
|
|
||||||
popd >/dev/null
|
|
||||||
echo "Cleaning temporary directory ..."
|
|
||||||
rm -rf "${TMPDIRTDE}"
|
|
||||||
cat <<EOF
|
|
||||||
|
|
||||||
Resulting archive:
|
|
||||||
EOF
|
|
||||||
\ls -l ${ARCHIVEDIR}/${ARCHIVENAME}
|
|
||||||
echo
|
|
||||||
echo "Have a nice day !"
|
|
||||||
break
|
|
||||||
done
|
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
--- a/dcop/dcoptypes.h.ORI 2012-04-24 16:24:05.448308109 -0400
|
||||||
|
+++ a/dcop/dcoptypes.h 2012-04-24 16:43:55.299809919 -0400
|
||||||
|
@@ -22,6 +22,9 @@
|
||||||
|
#ifndef DCOPTYPES_H
|
||||||
|
#define DCOPTYPES_H
|
||||||
|
|
||||||
|
+// generic template fallback for unknown types
|
||||||
|
+template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
|
||||||
|
+
|
||||||
|
#include <dcopref.h>
|
||||||
|
|
||||||
|
// standard c/c++ types
|
||||||
|
@@ -70,9 +73,6 @@
|
||||||
|
// And some KDE types
|
||||||
|
class KURL; inline const char* dcopTypeName( const KURL& ) { return "KURL"; }
|
||||||
|
|
||||||
|
-// generic template fallback for unknown types
|
||||||
|
-template <class T> inline const char* dcopTypeName( const T& ) { return "<unknown>"; }
|
||||||
|
-
|
||||||
|
// type initialization for standard c/c++ types
|
||||||
|
inline void dcopTypeInit(bool& b){b=false;}
|
||||||
|
inline void dcopTypeInit(char& c){c=0;}
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
diff -urN tdelibs/kio/kio/kdirwatch.cpp tdelibs.new/kio/kio/kdirwatch.cpp
|
||||||
|
--- tdelibs/kio/kio/kdirwatch.cpp 2012-04-05 13:26:08.000000000 -0500
|
||||||
|
+++ tdelibs.new/kio/kio/kdirwatch.cpp 2012-04-08 17:51:15.000000000 -0500
|
||||||
|
@@ -1155,6 +1155,7 @@
|
||||||
|
if(!e->dirty) return NoChange;
|
||||||
|
e->dirty = false;
|
||||||
|
}
|
||||||
|
+ if (e->isDir) return Changed;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Shouldn't happen: Ignore "unknown" notification method
|
||||||
|
@@ -1184,6 +1185,8 @@
|
||||||
|
if (exists) {
|
||||||
|
|
||||||
|
if (e->m_status == NonExistent) {
|
||||||
|
+ // ctime is the 'creation time' on windows, but with qMax
|
||||||
|
+ // we get the latest change of any kind, on any platform.
|
||||||
|
e->m_ctime = stat_buf.st_ctime;
|
||||||
|
e->m_status = Normal;
|
||||||
|
e->m_nlink = stat_buf.st_nlink;
|
||||||
Loading…
Reference in new issue