diff options
| author | TheJackiMonster <thejackimonster@gmail.com> | 2022-11-13 19:55:26 +0100 |
|---|---|---|
| committer | TheJackiMonster <thejackimonster@gmail.com> | 2022-11-13 19:55:26 +0100 |
| commit | 790193d7f837b75b9f932b0ca313dacce3c005f9 (patch) | |
| tree | 2c273fd706fd3e0291b612ce1dd4732bb76751ef | |
| parent | b1e2852eccf0047f24eff102647763f665f66ea4 (diff) | |
| download | messenger-gtk-790193d7f837b75b9f932b0ca313dacce3c005f9.tar.gz messenger-gtk-790193d7f837b75b9f932b0ca313dacce3c005f9.zip | |
Adjust snap configuration addressing some issues
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
| -rw-r--r-- | snap/snapcraft.yaml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index aaba014..f4df4fd 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml | |||
| @@ -79,11 +79,17 @@ parts: | |||
| 79 | - xdg-user-dirs | 79 | - xdg-user-dirs |
| 80 | - gobject-introspection | 80 | - gobject-introspection |
| 81 | - libxcursor1 | 81 | - libxcursor1 |
| 82 | - libgtk2.0-0 | ||
| 82 | - libgtk-3-0 | 83 | - libgtk-3-0 |
| 84 | - libevent-2.1-7 | ||
| 83 | - libltdl7 | 85 | - libltdl7 |
| 84 | - libc6 | 86 | - libc6 |
| 85 | 87 | - libgdk-pixbuf-2.0-0 | |
| 88 | - libcanberra-gtk-module | ||
| 89 | - libcanberra-gtk3-module | ||
| 90 | - locales-all | ||
| 86 | gnunet: | 91 | gnunet: |
| 92 | after: [ desktop-gtk3 ] | ||
| 87 | build-packages: | 93 | build-packages: |
| 88 | - build-essential | 94 | - build-essential |
| 89 | - libc6-dev | 95 | - libc6-dev |
| @@ -106,6 +112,8 @@ parts: | |||
| 106 | - libunistring2 | 112 | - libunistring2 |
| 107 | - libsqlite3-0 | 113 | - libsqlite3-0 |
| 108 | - libmicrohttpd12 | 114 | - libmicrohttpd12 |
| 115 | - libgnutls-dane0 | ||
| 116 | - libunbound8 | ||
| 109 | source: http://ftpmirror.gnu.org/gnunet/gnunet-0.18.1.tar.gz | 117 | source: http://ftpmirror.gnu.org/gnunet/gnunet-0.18.1.tar.gz |
| 110 | plugin: autotools | 118 | plugin: autotools |
| 111 | autotools-configure-parameters: | 119 | autotools-configure-parameters: |
| @@ -125,9 +133,7 @@ parts: | |||
| 125 | for f in $(ls $SNAPCRAFT_STAGE/usr/lib | grep libgnunet.*\.la); do | 133 | for f in $(ls $SNAPCRAFT_STAGE/usr/lib | grep libgnunet.*\.la); do |
| 126 | mv $SNAPCRAFT_STAGE/usr/lib/$f snap_fix/$f | 134 | mv $SNAPCRAFT_STAGE/usr/lib/$f snap_fix/$f |
| 127 | done | 135 | done |
| 128 | ./configure --prefix=$SNAPCRAFT_STAGE/usr | 136 | snapcraftctl build |
| 129 | make | ||
| 130 | make install | ||
| 131 | for f in $(ls snap_fix); do | 137 | for f in $(ls snap_fix); do |
| 132 | mv snap_fix/$f $SNAPCRAFT_STAGE/usr/lib/$f | 138 | mv snap_fix/$f $SNAPCRAFT_STAGE/usr/lib/$f |
| 133 | done | 139 | done |
| @@ -148,7 +154,6 @@ parts: | |||
| 148 | - desktop-file-utils | 154 | - desktop-file-utils |
| 149 | stage-packages: | 155 | stage-packages: |
| 150 | - libglib2.0-0 | 156 | - libglib2.0-0 |
| 151 | - libgdk-pixbuf-2.0-0 | ||
| 152 | - libhandy-1-0 | 157 | - libhandy-1-0 |
| 153 | - libnotify4 | 158 | - libnotify4 |
| 154 | - libqrencode4 | 159 | - libqrencode4 |
| @@ -158,12 +163,10 @@ parts: | |||
| 158 | - gir1.2-gtk-3.0 | 163 | - gir1.2-gtk-3.0 |
| 159 | - gir1.2-handy-1 | 164 | - gir1.2-handy-1 |
| 160 | - gir1.2-pango-1.0 | 165 | - gir1.2-pango-1.0 |
| 166 | - locales | ||
| 161 | source: http://ftpmirror.gnu.org/gnunet/messenger-gtk-0.7.0.tar.gz | 167 | source: http://ftpmirror.gnu.org/gnunet/messenger-gtk-0.7.0.tar.gz |
| 162 | plugin: make | 168 | plugin: make |
| 163 | override-build: | | 169 | override-build: | |
| 164 | for f in $(ls $SNAPCRAFT_STAGE/usr/lib | grep libgnunetchat); do | ||
| 165 | cp $SNAPCRAFT_STAGE/usr/lib/$f $SNAPCRAFT_PART_INSTALL/usr/lib/$f | ||
| 166 | done | ||
| 167 | export LD_LIBRARY_PATH="$SNAPCRAFT_STAGE/usr/lib" | 170 | export LD_LIBRARY_PATH="$SNAPCRAFT_STAGE/usr/lib" |
| 168 | make release | 171 | make release |
| 169 | mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/bin" | 172 | mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/bin" |