[arch-commits] Commit in wine/repos/multilib-x86_64 (8 files)

Felix Yan felixonmars at gemini.archlinux.org
Mon Jan 3 16:51:30 UTC 2022


    Date: Monday, January 3, 2022 @ 16:51:30
  Author: felixonmars
Revision: 1092496

archrelease: copy trunk to multilib-x86_64

Added:
  wine/repos/multilib-x86_64/30-win32-aliases.conf
    (from rev 1092495, wine/trunk/30-win32-aliases.conf)
  wine/repos/multilib-x86_64/PKGBUILD
    (from rev 1092495, wine/trunk/PKGBUILD)
  wine/repos/multilib-x86_64/wine-binfmt.conf
    (from rev 1092495, wine/trunk/wine-binfmt.conf)
  wine/repos/multilib-x86_64/wine.install
    (from rev 1092495, wine/trunk/wine.install)
Deleted:
  wine/repos/multilib-x86_64/30-win32-aliases.conf
  wine/repos/multilib-x86_64/PKGBUILD
  wine/repos/multilib-x86_64/wine-binfmt.conf
  wine/repos/multilib-x86_64/wine.install

-----------------------+
 30-win32-aliases.conf |   40 ++---
 PKGBUILD              |  360 ++++++++++++++++++++++++------------------------
 wine-binfmt.conf      |    4 
 wine.install          |   14 -
 4 files changed, 209 insertions(+), 209 deletions(-)

Deleted: 30-win32-aliases.conf
===================================================================
--- 30-win32-aliases.conf	2022-01-03 16:51:14 UTC (rev 1092495)
+++ 30-win32-aliases.conf	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias binding="same">
-    <family>MS Shell Dlg</family>
-    <accept><family>Microsoft Sans Serif</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-  <alias binding="same">
-    <family>MS Shell Dlg 2</family>
-    <accept><family>Tahoma</family></accept>
-    <default><family>sans-serif</family></default>
-  </alias>
-
-  <alias binding="same">
-    <family>MS Sans Serif</family>
-    <prefer><family>Microsoft Sans Serif</family></prefer>
-    <default><family>sans-serif</family></default>
-  </alias>
-</fontconfig>

Copied: wine/repos/multilib-x86_64/30-win32-aliases.conf (from rev 1092495, wine/trunk/30-win32-aliases.conf)
===================================================================
--- 30-win32-aliases.conf	                        (rev 0)
+++ 30-win32-aliases.conf	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="same">
+    <family>MS Shell Dlg</family>
+    <accept><family>Microsoft Sans Serif</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias binding="same">
+    <family>MS Shell Dlg 2</family>
+    <accept><family>Tahoma</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+
+  <alias binding="same">
+    <family>MS Sans Serif</family>
+    <prefer><family>Microsoft Sans Serif</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
+</fontconfig>

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-03 16:51:14 UTC (rev 1092495)
+++ PKGBUILD	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -1,180 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Eduardo Romero <eduardo at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=wine
-pkgver=7.0rc3
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(https://dl.winehq.org/wine/source/7.0/$pkgname-$_pkgbasever.tar.xz{,.sign}
-        30-win32-aliases.conf
-        wine-binfmt.conf)
-sha512sums=('81188bad943d7bbca6ac4bb43e6ae2df8ed70501fd99c33118c7b3ead2802b812f887628c409e093b45ba9d1282efa11e6d7b57a97ef081f23f3f02554922fed'
-            'SKIP'
-            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
-validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
-              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(x86_64)
-options=(staticlibs)
-license=(LGPL)
-depends=(
-  fontconfig      lib32-fontconfig
-  lcms2           lib32-lcms2
-  libxml2         lib32-libxml2
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  freetype2       lib32-freetype2
-  glu             lib32-glu
-  libsm           lib32-libsm
-  gcc-libs        lib32-gcc-libs
-  libpcap         lib32-libpcap
-  faudio          lib32-faudio
-  desktop-file-utils
-)
-makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  gnutls                lib32-gnutls
-  libxinerama           lib32-libxinerama
-  libxcomposite         lib32-libxcomposite
-  libxmu                lib32-libxmu
-  libxxf86vm            lib32-libxxf86vm
-  libldap               lib32-libldap
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  libpulse              lib32-libpulse
-  alsa-lib              lib32-alsa-lib
-  libxcomposite         lib32-libxcomposite
-  mesa                  lib32-mesa
-  mesa-libgl            lib32-mesa-libgl
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vulkan-icd-loader     lib32-vulkan-icd-loader
-  vkd3d                 lib32-vkd3d
-  sdl2                  lib32-sdl2
-  libcups               lib32-libcups
-  libgphoto2
-  sane
-  gsm
-  vulkan-headers
-  samba
-  opencl-headers
-)
-optdepends=(
-  giflib                lib32-giflib
-  libpng                lib32-libpng
-  libldap               lib32-libldap
-  gnutls                lib32-gnutls
-  mpg123                lib32-mpg123
-  openal                lib32-openal
-  v4l-utils             lib32-v4l-utils
-  libpulse              lib32-libpulse
-  alsa-plugins          lib32-alsa-plugins
-  alsa-lib              lib32-alsa-lib
-  libjpeg-turbo         lib32-libjpeg-turbo
-  libxcomposite         lib32-libxcomposite
-  libxinerama           lib32-libxinerama
-  opencl-icd-loader     lib32-opencl-icd-loader
-  libxslt               lib32-libxslt
-  gst-plugins-base-libs lib32-gst-plugins-base-libs
-  vkd3d                 lib32-vkd3d
-  sdl2                  lib32-sdl2
-  libgphoto2
-  sane
-  gsm
-  cups
-  samba           dosbox
-)
-makedepends=(${makedepends[@]} ${depends[@]})
-install=wine.install
-
-prepare() {
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Doesn't compile without remove these flags as of 4.10
-  export CFLAGS="${CFLAGS/-fno-plt/}"
-  export LDFLAGS="${LDFLAGS/,-z,now/}"
-
-  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
-
-  # Fix openldap 2.5+ detection
-  sed 's/-lldap_r/-lldap/' -i $pkgname/configure
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-}
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Building Wine-64..."
-
-  mkdir $pkgname-64-build
-  cd "$srcdir/$pkgname-64-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --with-x \
-    --with-gstreamer \
-    --enable-win64
-  # Gstreamer was disabled for FS#33655
-
-  make
-
-  _wine32opts=(
-    --libdir=/usr/lib32
-    --with-wine64="$srcdir/$pkgname-64-build"
-  )
-
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --with-x \
-    --with-gstreamer \
-    "${_wine32opts[@]}"
-
-  make
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib32" \
-    dlldir="$pkgdir/usr/lib32/wine" install
-
-  msg2 "Packaging Wine-64..."
-  cd "$srcdir/$pkgname-64-build"
-  make prefix="$pkgdir/usr" \
-    libdir="$pkgdir/usr/lib" \
-    dlldir="$pkgdir/usr/lib/wine" install
-
-  # Font aliasing settings for Win32 applications
-  install -d "$pkgdir"/usr/share/fontconfig/conf.{avail,default}
-  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/usr/share/fontconfig/conf.avail"
-  ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/usr/share/fontconfig/conf.default/30-win32-aliases.conf"
-  install -Dm 644 "$srcdir/wine-binfmt.conf" "$pkgdir/usr/lib/binfmt.d/wine.conf"
-
-  i686-w64-mingw32-strip --strip-unneeded "$pkgdir"/usr/lib32/wine/i386-windows/*.dll
-  x86_64-w64-mingw32-strip --strip-unneeded "$pkgdir"/usr/lib/wine/x86_64-windows/*.dll
-}
-
-# vim:set ts=8 sts=2 sw=2 et:

Copied: wine/repos/multilib-x86_64/PKGBUILD (from rev 1092495, wine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -0,0 +1,180 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Eduardo Romero <eduardo at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=wine
+pkgver=7.0rc4
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(https://dl.winehq.org/wine/source/7.0/$pkgname-$_pkgbasever.tar.xz{,.sign}
+        30-win32-aliases.conf
+        wine-binfmt.conf)
+sha512sums=('9debaa232d21c0613e1a7fb8560093563e6536ac808bb38a8d48c5d7234e00dc6053853c2b0c039eec90a214d0f167680c729500c662c72cc74e8bad26ad0d72'
+            'SKIP'
+            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
+            'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
+validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
+              DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(x86_64)
+options=(staticlibs)
+license=(LGPL)
+depends=(
+  fontconfig      lib32-fontconfig
+  lcms2           lib32-lcms2
+  libxml2         lib32-libxml2
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxi           lib32-libxi
+  gettext         lib32-gettext
+  freetype2       lib32-freetype2
+  glu             lib32-glu
+  libsm           lib32-libsm
+  gcc-libs        lib32-gcc-libs
+  libpcap         lib32-libpcap
+  faudio          lib32-faudio
+  desktop-file-utils
+)
+makedepends=(autoconf bison perl fontforge flex mingw-w64-gcc
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  gnutls                lib32-gnutls
+  libxinerama           lib32-libxinerama
+  libxcomposite         lib32-libxcomposite
+  libxmu                lib32-libxmu
+  libxxf86vm            lib32-libxxf86vm
+  libldap               lib32-libldap
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  libpulse              lib32-libpulse
+  alsa-lib              lib32-alsa-lib
+  libxcomposite         lib32-libxcomposite
+  mesa                  lib32-mesa
+  mesa-libgl            lib32-mesa-libgl
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
+  vkd3d                 lib32-vkd3d
+  sdl2                  lib32-sdl2
+  libcups               lib32-libcups
+  libgphoto2
+  sane
+  gsm
+  vulkan-headers
+  samba
+  opencl-headers
+)
+optdepends=(
+  giflib                lib32-giflib
+  libpng                lib32-libpng
+  libldap               lib32-libldap
+  gnutls                lib32-gnutls
+  mpg123                lib32-mpg123
+  openal                lib32-openal
+  v4l-utils             lib32-v4l-utils
+  libpulse              lib32-libpulse
+  alsa-plugins          lib32-alsa-plugins
+  alsa-lib              lib32-alsa-lib
+  libjpeg-turbo         lib32-libjpeg-turbo
+  libxcomposite         lib32-libxcomposite
+  libxinerama           lib32-libxinerama
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vkd3d                 lib32-vkd3d
+  sdl2                  lib32-sdl2
+  libgphoto2
+  sane
+  gsm
+  cups
+  samba           dosbox
+)
+makedepends=(${makedepends[@]} ${depends[@]})
+install=wine.install
+
+prepare() {
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Doesn't compile without remove these flags as of 4.10
+  export CFLAGS="${CFLAGS/-fno-plt/}"
+  export LDFLAGS="${LDFLAGS/,-z,now/}"
+
+  sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
+
+  # Fix openldap 2.5+ detection
+  sed 's/-lldap_r/-lldap/' -i $pkgname/configure
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+}
+
+build() {
+  cd "$srcdir"
+
+  msg2 "Building Wine-64..."
+
+  mkdir $pkgname-64-build
+  cd "$srcdir/$pkgname-64-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --libdir=/usr/lib \
+    --with-x \
+    --with-gstreamer \
+    --enable-win64
+  # Gstreamer was disabled for FS#33655
+
+  make
+
+  _wine32opts=(
+    --libdir=/usr/lib32
+    --with-wine64="$srcdir/$pkgname-64-build"
+  )
+
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --with-x \
+    --with-gstreamer \
+    "${_wine32opts[@]}"
+
+  make
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib32" \
+    dlldir="$pkgdir/usr/lib32/wine" install
+
+  msg2 "Packaging Wine-64..."
+  cd "$srcdir/$pkgname-64-build"
+  make prefix="$pkgdir/usr" \
+    libdir="$pkgdir/usr/lib" \
+    dlldir="$pkgdir/usr/lib/wine" install
+
+  # Font aliasing settings for Win32 applications
+  install -d "$pkgdir"/usr/share/fontconfig/conf.{avail,default}
+  install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/usr/share/fontconfig/conf.avail"
+  ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/usr/share/fontconfig/conf.default/30-win32-aliases.conf"
+  install -Dm 644 "$srcdir/wine-binfmt.conf" "$pkgdir/usr/lib/binfmt.d/wine.conf"
+
+  i686-w64-mingw32-strip --strip-unneeded "$pkgdir"/usr/lib32/wine/i386-windows/*.dll
+  x86_64-w64-mingw32-strip --strip-unneeded "$pkgdir"/usr/lib/wine/x86_64-windows/*.dll
+}
+
+# vim:set ts=8 sts=2 sw=2 et:

Deleted: wine-binfmt.conf
===================================================================
--- wine-binfmt.conf	2022-01-03 16:51:14 UTC (rev 1092495)
+++ wine-binfmt.conf	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -1,2 +0,0 @@
-# Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:

Copied: wine/repos/multilib-x86_64/wine-binfmt.conf (from rev 1092495, wine/trunk/wine-binfmt.conf)
===================================================================
--- wine-binfmt.conf	                        (rev 0)
+++ wine-binfmt.conf	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:

Deleted: wine.install
===================================================================
--- wine.install	2022-01-03 16:51:14 UTC (rev 1092495)
+++ wine.install	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -1,7 +0,0 @@
-post_install() {
-  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
-}
-
-post_remove() {
-  echo "binfmt binary formats will be updated at reboot"
-}

Copied: wine/repos/multilib-x86_64/wine.install (from rev 1092495, wine/trunk/wine.install)
===================================================================
--- wine.install	                        (rev 0)
+++ wine.install	2022-01-03 16:51:30 UTC (rev 1092496)
@@ -0,0 +1,7 @@
+post_install() {
+  echo "Run 'systemctl restart systemd-binfmt' in order to make the wine binfmt available on your system."
+}
+
+post_remove() {
+  echo "binfmt binary formats will be updated at reboot"
+}



More information about the arch-commits mailing list