diff options
author | Eric Hameleers <alien@slackware.com> | 2023-01-27 19:49:58 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-01-27 19:49:58 +0000 |
commit | f2b577b7d4c5ba951522a5e781adc6776ebe33a5 (patch) | |
tree | 33cd8d5243288ae3a6ff4dcd10023b0836db354b | |
parent | 4930ba907fcf517477ae12235defcdf4fb09f20c (diff) | |
download | asb-f2b577b7d4c5ba951522a5e781adc6776ebe33a5.tar.gz asb-f2b577b7d4c5ba951522a5e781adc6776ebe33a5.tar.xz |
wine: finally, properly install Gecko and Mono into the package
-rwxr-xr-x | wine/build/wine.SlackBuild | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 9cbef016..2a095f7b 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -171,7 +171,7 @@ DO_WINE64=${DO_WINE64:-"yes"} # Add the "Gecko", Wine's own implementation of Internet Explorer. # For matching wine-gecko & wine versions, see http://wiki.winehq.org/Gecko -GECKO=${GECKO:-2.47.2} +GECKO=${GECKO:-2.47.3} # Add Wine-mono, Wine"s implementation of Mono. # The Mono package should always be removed before installing native .NET. @@ -258,21 +258,21 @@ SRCURL[$DLI]="https://github.com/${PRGNAM}-staging/${PRGNAM}-staging/archive/v${ STAGINGSRC="${SOURCE[$DLI]}" DLI=$(($DLI+1)) -SOURCE[$DLI]="$SRCDIR/wine-gecko-${GECKO}-x86.msi" -SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine-gecko-${GECKO}-x86.msi" +SOURCE[$DLI]="$SRCDIR/wine-gecko-${GECKO}-x86.tar.xz" +SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine-gecko-${GECKO}-x86.tar.xz" GECKO32SRC="${SOURCE[$DLI]}" if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then DLI=$(($DLI+1)) - SOURCE[$DLI]="$SRCDIR/wine-gecko-${GECKO}-x86_64.msi" - SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine-gecko-${GECKO}-x86_64.msi" + SOURCE[$DLI]="$SRCDIR/wine-gecko-${GECKO}-x86_64.tar.xz" + SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine-gecko-${GECKO}-x86_64.tar.xz" GECKO64SRC="${SOURCE[$DLI]}" fi if [ "$MONO" != "NO" ]; then DLI=$(($DLI+1)) - SOURCE[$DLI]="$SRCDIR/wine-mono-${MONO}-x86.msi" - SRCURL[$DLI]="http://dl.winehq.org/wine/wine-mono/${MONO}/wine-mono-${MONO}-x86.msi" + SOURCE[$DLI]="$SRCDIR/wine-mono-${MONO}-x86.tar.xz" + SRCURL[$DLI]="http://dl.winehq.org/wine/wine-mono/${MONO}/wine-mono-${MONO}-x86.tar.xz" MONOSRC="${SOURCE[$DLI]}" fi @@ -357,6 +357,13 @@ cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE[0]} +tar -xf ${GECKO32SRC} +if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then + tar -xf ${GECKO64SRC} +fi +if [ "$MONO" != "NO" ]; then + tar -xf ${MONOSRC} +fi [ "$SRCVER" != "$VERSION" ] && mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} @@ -444,17 +451,17 @@ else cd - fi -# Add the wine-gecko MSI installer(s) to the Wine package: +# Add wine-gecko to the Wine package: mkdir -p $PKG/usr/share/wine/gecko -install -m0644 ${GECKO32SRC} $PKG/usr/share/wine/gecko/ +mv -i $TMP/tmp-$PRGNAM/$(basename $GECKO32SRC .tar.xz) $PKG/usr/share/wine/gecko/ if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then - install -m0644 ${GECKO64SRC} $PKG/usr/share/wine/gecko/ + mv -i $TMP/tmp-$PRGNAM/$(basename $GECKO64SRC .tar.xz) $PKG/usr/share/wine/gecko/ fi # Add the wine-mono MSI installer to the Wine package: if [ "$MONO" != "NO" ]; then mkdir -p $PKG/usr/share/wine/mono - install -m0644 ${MONOSRC} $PKG/usr/share/wine/mono/ + mv -i $TMP/tmp-$PRGNAM/wine-mono-${MONO} $PKG/usr/share/wine/mono/ fi # Add the font converter programs if they were created using fontforge: @@ -465,10 +472,10 @@ fi # Add a desktop menu for the winecfg program: mkdir -p $PKG/usr/share/{icons/hicolor/scalable/apps,pixmaps} -convert $SRCDIR/wine.svg -scale 64 $PKG/usr/share/pixmaps/wine.png +convert $SRCDIR/wine.svg -scale 256 $PKG/usr/share/pixmaps/wine.png install -m0644 $SRCDIR/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/ # I used karbon to extract a single picture out of the SVG: -convert $SRCDIR/winecfg.png -scale 64 $PKG/usr/share/pixmaps/winecfg.png +convert $SRCDIR/winecfg.png -scale 256 $PKG/usr/share/pixmaps/winecfg.png cp -a programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/ mkdir -p $PKG/usr/share/applications cat <<_EOT_ > $PKG/usr/share/applications/winecfg.desktop @@ -481,6 +488,16 @@ Comment=Configure Wine Type=Application Categories=Application;Settings _EOT_ +cat <<_EOT_ > $PKG/usr/share/applications/winebrowser.desktop +[Desktop Entry] +Exec=wine winebrowser c: +Icon=wine +Terminal=false +Name=Browse Wine's C: Drive +Comment=Browse Wine's C: drive +Type=Application +Categories=Application; +_EOT_ # Add some documentation to the package: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION |