[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] project/bundles: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-11-25 5:03:45
Message-ID: E1cA8fp-0005v4-Ug () code ! kde ! org
[Download RAW message or body]

Git commit c8049497335a81e6d8a58f4a00e74589dbce8a7b by Gilles Caulier.
Committed on 25/11/2016 at 05:03.
Pushed by cgilles into branch 'master'.

polish

M  +1    -1    project/bundles/macports/03-build-digikam.sh
M  +1    -1    project/bundles/macports/04-build-installer.sh
M  +1    -1    project/bundles/mxe/config.sh

https://commits.kde.org/digikam-software-compilation/c8049497335a81e6d8a58f4a00e74589dbce8a7b


diff --git a/project/bundles/macports/03-build-digikam.sh \
b/project/bundles/macports/03-build-digikam.sh index d3b6046..8bb00e8 100755
--- a/project/bundles/macports/03-build-digikam.sh
+++ b/project/bundles/macports/03-build-digikam.sh
@@ -80,7 +80,7 @@ fi
 git -C ./core checkout $DK_VERSION
 git -C ./extra/kipi-plugins checkout $DK_VERSION
 
-cp -f $ORIG_WD/../../bootstrap.macports $DK_BUILDTEMP/digikam-$DK_VERSION
+cp -f $ORIG_WD/../../../bootstrap.macports $DK_BUILDTEMP/digikam-$DK_VERSION
 
 echo -e "\n\n"
 echo "---------- Configure digiKam $DK_VERSION"
diff --git a/project/bundles/macports/04-build-installer.sh \
b/project/bundles/macports/04-build-installer.sh index 780afcc..b84b143 100755
--- a/project/bundles/macports/04-build-installer.sh
+++ b/project/bundles/macports/04-build-installer.sh
@@ -58,7 +58,7 @@ cd $ORIG_WD/icon-rcc
 
 rm -f CMakeCache.txt > /dev/null
 
-cp -f $ORIG_WD/../../bootstrap.macports .
+cp -f $ORIG_WD/../../../bootstrap.macports .
 
 cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
       -DCMAKE_BUILD_TYPE=debug \
diff --git a/project/bundles/mxe/config.sh b/project/bundles/mxe/config.sh
index e08ca19..eee80f9 100644
--- a/project/bundles/mxe/config.sh
+++ b/project/bundles/mxe/config.sh
@@ -11,7 +11,7 @@
 
 #------------
 # IMPORTANT: Target Windows architecture to build installer. Possible values: 32 or \
                64 bits.
-MXE_ARCHBITS=64
+MXE_ARCHBITS=32
 #------------
 
 if [[ $MXE_ARCHBITS == 32 ]]; then


[prev in list] [next in list] [prev in thread] [next in thread]