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

List:       kde-kimageshop
Subject:    Re: [graphics/krita] packaging/linux/appimage: Fix AppImage's architecture naming
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2020-07-23 11:24:36
Message-ID: CAEkBSfXvAfZ6bs=EN+zet=3FvrSV9or8wOcAqVGa2tZDTsrk9Q () mail ! gmail ! com
[Download RAW message or body]

Hi, Amyspark!

Thank you for the fix! I've triggered the deps build again! :)

On Thu, Jul 23, 2020 at 4:06 AM L. E. Segovia <null@kde.org> wrote:

> Git commit 05babe088fb94efc21953e50d1926284e5f2772c by L. E. Segovia.
> Committed on 23/07/2020 at 01:01.
> Pushed by lsegovia into branch 'master'.
>
> Fix AppImage's architecture naming
>
> The dependency jobs are failing because AppImageKit has its own custom
> naming. I had added the case arm64 (dpkg) == aarch64 (AppImageKit),
> but I missed that amd64 == x86_64.
>
> The rest are OK or are unsupported by AppImageKit.
>
> Please retry the dependency jobs after this commit.
>
> (cherry picked from commit b379c5646265cc903d82f499d14cfbbce5cb0e13)
>
> CCMAIL: kimageshop@kde.org
>
> M  +2    -0    packaging/linux/appimage/build-gmic-qt.sh
> M  +2    -0    packaging/linux/appimage/build-image.sh
>
>
> https://invent.kde.org/graphics/krita/commit/05babe088fb94efc21953e50d1926284e5f2772c
>
> diff --git a/packaging/linux/appimage/build-gmic-qt.sh
> b/packaging/linux/appimage/build-gmic-qt.sh
> index cc10d24000..562e35501a 100755
> --- a/packaging/linux/appimage/build-gmic-qt.sh
> +++ b/packaging/linux/appimage/build-gmic-qt.sh
> @@ -45,6 +45,8 @@ linuxdeployqt
> $BUILD_PREFIX/gmic_qt_krita.appdir/usr/bin/gmic_krita_qt.desktop -
>  # Make sure it has a consistent name too
>  if [[ $ARCH == "arm64" ]]; then
>    APPIMAGE_ARCHITECTURE="aarch64"
> +elif [[ $ARCH == "amd64" ]]; then
> +  APPIMAGE_ARCHITECTURE="x86_64"
>  else
>    APPIMAGE_ARCHITECTURE=$ARCH
>  fi
> diff --git a/packaging/linux/appimage/build-image.sh
> b/packaging/linux/appimage/build-image.sh
> index 239a290627..81a1a35f02 100755
> --- a/packaging/linux/appimage/build-image.sh
> +++ b/packaging/linux/appimage/build-image.sh
> @@ -200,6 +200,8 @@ linuxdeployqt
> $APPDIR/usr/share/applications/org.kde.krita.desktop \
>
>  if [[ $ARCH == "arm64" ]]; then
>    APPIMAGE_ARCHITECTURE="aarch64"
> +elif [[ $ARCH == "amd64" ]]; then
> +  APPIMAGE_ARCHITECTURE="x86_64"
>  else
>    APPIMAGE_ARCHITECTURE=$ARCH
>  fi
>


-- 
Dmitry Kazakov

[Attachment #3 (text/html)]

<div dir="ltr"><div>Hi, Amyspark!</div><div><br></div><div>Thank you for the fix! \
I&#39;ve triggered the deps build again! :)<br></div></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jul 23, 2020 at 4:06 AM \
L. E. Segovia &lt;<a href="mailto:null@kde.org">null@kde.org</a>&gt; \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Git commit \
05babe088fb94efc21953e50d1926284e5f2772c by L. E. Segovia.<br> Committed on \
23/07/2020 at 01:01.<br> Pushed by lsegovia into branch &#39;master&#39;.<br>
<br>
Fix AppImage&#39;s architecture naming<br>
<br>
The dependency jobs are failing because AppImageKit has its own custom<br>
naming. I had added the case arm64 (dpkg) == aarch64 (AppImageKit),<br>
but I missed that amd64 == x86_64.<br>
<br>
The rest are OK or are unsupported by AppImageKit.<br>
<br>
Please retry the dependency jobs after this commit.<br>
<br>
(cherry picked from commit b379c5646265cc903d82f499d14cfbbce5cb0e13)<br>
<br>
CCMAIL: <a href="mailto:kimageshop@kde.org" \
target="_blank">kimageshop@kde.org</a><br> <br>
M   +2      -0      packaging/linux/appimage/build-gmic-qt.sh<br>
M   +2      -0      packaging/linux/appimage/build-image.sh<br>
<br>
<a href="https://invent.kde.org/graphics/krita/commit/05babe088fb94efc21953e50d1926284e5f2772c" \
rel="noreferrer" target="_blank">https://invent.kde.org/graphics/krita/commit/05babe088fb94efc21953e50d1926284e5f2772c</a><br>
 <br>
diff --git a/packaging/linux/appimage/build-gmic-qt.sh \
b/packaging/linux/appimage/build-gmic-qt.sh<br> index cc10d24000..562e35501a \
                100755<br>
--- a/packaging/linux/appimage/build-gmic-qt.sh<br>
+++ b/packaging/linux/appimage/build-gmic-qt.sh<br>
@@ -45,6 +45,8 @@ linuxdeployqt \
$BUILD_PREFIX/gmic_qt_krita.appdir/usr/bin/gmic_krita_qt.desktop -<br>  # Make sure \
it has a consistent name too<br>  if [[ $ARCH == &quot;arm64&quot; ]]; then<br>
     APPIMAGE_ARCHITECTURE=&quot;aarch64&quot;<br>
+elif [[ $ARCH == &quot;amd64&quot; ]]; then<br>
+   APPIMAGE_ARCHITECTURE=&quot;x86_64&quot;<br>
  else<br>
     APPIMAGE_ARCHITECTURE=$ARCH<br>
  fi<br>
diff --git a/packaging/linux/appimage/build-image.sh \
b/packaging/linux/appimage/build-image.sh<br> index 239a290627..81a1a35f02 100755<br>
--- a/packaging/linux/appimage/build-image.sh<br>
+++ b/packaging/linux/appimage/build-image.sh<br>
@@ -200,6 +200,8 @@ linuxdeployqt \
$APPDIR/usr/share/applications/org.kde.krita.desktop \<br> <br>
  if [[ $ARCH == &quot;arm64&quot; ]]; then<br>
     APPIMAGE_ARCHITECTURE=&quot;aarch64&quot;<br>
+elif [[ $ARCH == &quot;amd64&quot; ]]; then<br>
+   APPIMAGE_ARCHITECTURE=&quot;x86_64&quot;<br>
  else<br>
     APPIMAGE_ARCHITECTURE=$ARCH<br>
  fi<br>
</blockquote></div><br clear="all"><br>-- <br><div dir="ltr" \
class="gmail_signature">Dmitry Kazakov</div>



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