diff --git a/build.sh b/build.sh index 1fc39bc79..f73eb0877 100755 --- a/build.sh +++ b/build.sh @@ -26,6 +26,8 @@ for subroutine in ${_needed_functions} do source _buildscripts/functions/${subroutine} done +# load makepkg.conf +source _buildscripts/${current_repo}-${_arch}-makepkg.conf current_repo="$_cur_repo" @@ -55,7 +57,7 @@ build_it() do_makedeps do_deps - ../makepkg -f $_mkpkg_flags || BUILD_BROKEN="1" + ../makepkg -fL $_mkpkg_flags || BUILD_BROKEN="1" if [ "$BUILD_BROKEN" = "1" ] ; then if [ "$_build_stop" = "1" ] ; then @@ -71,7 +73,7 @@ build_it() fi fi else - ../makepkg -f $_mkpkg_flags || BUILD_BROKEN="1" + ../makepkg -fL $_mkpkg_flags || BUILD_BROKEN="1" if [ "$BUILD_BROKEN" = "1" ] ; then if [ "$_build_stop" = "1" ] ; then @@ -95,6 +97,35 @@ build_it() exit 1 fi + # Create log packages + ls *.log + mkdir -p log/var/log/chakra/$module + mv -v *.log log/var/log/chakra/$module + # Create log/.PKGINFO + local builddate=$(date -u "+%s") + if [[ -n $PACKAGER ]]; then + local packager="$PACKAGER" + else + local packager="Unknown Packager" + fi + local size="$(du -sk)" + size="$(( ${size%%[^0-9]*} * 1024 ))" + + echo "# Generated by makepkg $myver" >log/log/.PKGINFO + echo "# $(LC_ALL=C date -u)" >>log/.PKGINFO + echo "pkgname = $module" >>log/.PKGINFO + echo "builddate = $builddate" >>log/.PKGINFO + echo "packager = $packager" >>log/.PKGINFO + echo "size = $size" >>log/.PKGINFO + echo "arch = $PKGARCH" >>log/.PKGINFO + echo "group = chakra-log" >>log/.PKGINFO + echo "group = chakra-log-uninstall" >>log/.PKGINFO + echo "group = kde-uninstall" >>log/.PKGINFO + # Create tarball + tar -cJf $module-log-$builddate-$PKGARCH.pkg.tar.xz log/var log/.PKGINFO + # Move pkg + mv -v $module-log-$builddate-$PKGARCH.pkg.tar.xz ../../_repo/local + # Install packages if [ "$_build_autoinstall" = "1" ] ; then # Look for the exact package names : @@ -136,6 +167,8 @@ build_it() msg "removing debug packages ..." sudo pacman -Rcs kde-debug --noconfirm &>/dev/null echo " " + msg "removing log packages ..." + sudo pacman -Rcs chakra-log --noconfirm &>/dev/null echo " " } diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD index 42eba8b0d..36cc8edcf 100644 --- a/kdebindings/PKGBUILD +++ b/kdebindings/PKGBUILD @@ -39,13 +39,11 @@ license=('GPL' 'LGPL' 'FDL') install=${_origname}.install options=('docs' '!splithdr' 'splitdbg') -makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt' +makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt>=4.8.1' 'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}" "kdepim-runtime>=${_kdever}") -source=($_mirror/${_origname}-$_kdever.tar.bz2 - fix-ruby-bindings.patch) -md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` - 95efe147489fdd8acb421a0a450e635a) +source=($_mirror/${_origname}-$_kdever.tar.bz2) +md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) # @@ -55,8 +53,6 @@ build() { cd ${srcdir}/${_origname}-${pkgver} - patch -Np3 -i ${srcdir}/fix-ruby-bindings.patch - #fix ruby for f in `find ruby -name CMakeLists.txt`; do sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/${_ARCHITECTURE}-linux|" "${f}" @@ -155,7 +151,7 @@ package_kdebindings-php() package_kdebindings-python() { pkgdesc="KDE Bindings - Python" - depends=("${_origname}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt') # "kdepim-runtime>=${_kdever}" + depends=("${_origname}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt>=4.8.1' "kdepim-runtime>=${_kdever}") conflicts=("kdemod-${_origname}-python=${_kdever}") groups=("kde" "kde-devel" "${_origname}" "kde-uninstall") diff --git a/kdebindings/fix-ruby-bindings.patch b/kdebindings/fix-ruby-bindings.patch deleted file mode 100644 index 830dc8ee8..000000000 --- a/kdebindings/fix-ruby-bindings.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/07/20 14:22:25 1152205 -+++ trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/09/30 15:34:41 1181284 -@@ -52,16 +52,17 @@ - VALUE bt = rb_funcall(info, rb_intern("backtrace"), 0); - VALUE message = RARRAY_PTR(bt)[0]; - -+ VALUE obj_string = rb_obj_as_string(info); - QString errormessage = QString("%1: %2 (%3)") -- .arg( STR2CSTR(message) ) -- .arg( STR2CSTR(rb_obj_as_string(info)) ) -- .arg( rb_class2name(CLASS_OF(info)) ); -+ .arg( QString::fromLatin1(StringValuePtr(message)) ) -+ .arg( QString::fromLatin1(StringValuePtr(obj_string)) ) -+ .arg( QString::fromLatin1(rb_class2name(CLASS_OF(info))) ); - fprintf(stderr, "%s\n", errormessage.toLatin1().constData()); - - QString tracemessage; - for(int i = 1; i < RARRAY_LEN(bt); ++i) { - if( TYPE(RARRAY_PTR(bt)[i]) == T_STRING ) { -- QString s = QString("%1\n").arg( STR2CSTR(RARRAY_PTR(bt)[i]) ); -+ QString s = QString("%1\n").arg( QString::fromLatin1(StringValuePtr(RARRAY_PTR(bt)[i])) ); - Q_ASSERT( ! s.isNull() ); - tracemessage += s; - fprintf(stderr, "\t%s", s.toLatin1().constData());