Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11049392
D1949.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D1949.id.diff
View Options
diff --git a/files/wine.binfmt b/files/wine.binfmt
new file mode 100644
--- /dev/null
+++ b/files/wine.binfmt
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : wine
-version : 3.0_rc5
-release : 31
+version : '3.0'
+release : 32
source :
- - https://dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz : 4b4a9249db8b1ca6800421dd52f6ae411bbd81d75704022fdd464a8bc57dc206
+ - https://dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz : 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec
license : LGPL-2.1
component : virt
summary : Wine compatibility layer for Windows emulation.
@@ -29,9 +29,11 @@
- pkgconfig32(libpng)
- pkgconfig32(libpulse)
- pkgconfig32(libtiff-4)
+ - pkgconfig32(libturbojpeg)
- pkgconfig32(libv4l1)
- pkgconfig32(libxml-2.0)
- pkgconfig32(libxslt)
+ - pkgconfig32(ncursesw)
- pkgconfig32(ocl-icd)
- pkgconfig32(openal)
- pkgconfig32(OpenCL)
@@ -49,10 +51,8 @@
- cups-32bit-devel
- glibc-32bit-devel
- libgcc-32bit
- - libjpeg-turbo-32bit-devel
- libpcap-32bit-devel
- libpth-32bit-devel
- - ncurses-32bit-devel
- openldap-32bit-devel
- unixodbc-32bit-devel
patterns :
@@ -79,30 +79,29 @@
# Get 64-bit done first.
mkdir wine64 && pushd wine64
- ../configure %CONFOPTS% --enable-win64 \
+ ../configure %CONFOPTS% \
+ --enable-win64 \
--with-x
- %make
popd
-build : |
+
# 32-bit now
mkdir wine32 && pushd wine32
- PKG_CONFIG_PATH=/usr/lib32/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig ../configure %CONFOPTS% --with-wine64=../wine64 \
+ PKG_CONFIG_PATH=/usr/lib32/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig ../configure %CONFOPTS% \
+ --with-wine64=../wine64 \
--libdir=/usr/lib32 \
--with-x
- %make
popd
+build : |
+ %make -C wine64
+ %make -C wine32
install : |
- pushd wine32
- %make_install
- popd
+ %make_install -C wine32
+ %make_install -C wine64
- pushd wine64
- %make_install
- popd
+ # Note: systemd-binfmt must be (re)started for this to work
+ install -Dm00644 $pkgfiles/wine.binfmt $installdir/%libdir%/binfmt.d/wine.conf
# Font aliasing settings for Win32 applications
- install -d 755 $installdir/usr/share/fonts/conf.d
- install -d 755 $installdir/usr/share/fontconfig/conf.avail
- install -m 644 $pkgfiles/30-win32-aliases.conf $installdir/usr/share/fontconfig/conf.avail
+ install -dm00755 $installdir/usr/share/fonts/conf.d
+ install -Dm00644 $pkgfiles/30-win32-aliases.conf -t $installdir/usr/share/fontconfig/conf.avail
ln -s /usr/share/fontconfig/conf.avail/30-win32-aliases.conf $installdir/usr/share/fonts/conf.d/30-win32-aliases.conf
-
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -20,6 +20,7 @@
<PartOf>virt</PartOf>
<Files>
<Path fileType="executable">/usr/bin</Path>
+ <Path fileType="library">/usr/lib64/binfmt.d/wine.conf</Path>
<Path fileType="library">/usr/lib64/lib*.so.*</Path>
<Path fileType="library">/usr/lib64/wine/acledit.dll.so</Path>
<Path fileType="library">/usr/lib64/wine/aclui.dll.so</Path>
@@ -1801,7 +1802,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="31">wine</Dependency>
+ <Dependency release="32">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wine</Path>
@@ -1816,8 +1817,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="31">wine-32bit</Dependency>
- <Dependency release="31">wine-devel</Dependency>
+ <Dependency release="32">wine-32bit</Dependency>
+ <Dependency release="32">wine-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.so</Path>
@@ -1830,7 +1831,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="31">wine</Dependency>
+ <Dependency release="32">wine</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -1838,12 +1839,12 @@
</Files>
</Package>
<History>
- <Update release="31">
- <Date>2018-01-05</Date>
- <Version>3.0_rc5</Version>
+ <Update release="32">
+ <Date>2018-01-19</Date>
+ <Version>3.0</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 5:41 PM (2 h, 46 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5828456
Default Alt Text
D1949.id.diff (4 KB)
Attached To
Mode
D1949: Update wine to 3.0
Attached
Detach File
Event Timeline
Log In to Comment