Marcel Telka
2022-08-18 b82ce6c57904eec8a2e82b9478a7389774f74f83
wine: rebuild to update perl dependency

5 files modified
48 ■■■■■ changed files
components/runtime/wine/Makefile 22 ●●●●● patch | view | raw | blame | history
components/runtime/wine/manifests/sample-manifest.p5m 3 ●●●● patch | view | raw | blame | history
components/runtime/wine/patches/05-configure_fPIC.patch 19 ●●●●● patch | view | raw | blame | history
components/runtime/wine/pkg5 3 ●●●● patch | view | raw | blame | history
components/runtime/wine/wine.p5m 1 ●●●● patch | view | raw | blame | history
components/runtime/wine/Makefile
@@ -12,10 +12,13 @@
# Copyright (c) 2019 Evgeny Litvinenko
#
BUILD_BITS = 32
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        wine
COMPONENT_VERSION=    4.17
COMPONENT_REVISION =    1
COMPONENT_PROJECT_URL=    https://www.winehq.org/
COMPONENT_SUMMARY=    Wine - Run Windows applications.
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -29,27 +32,17 @@
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
COMPONENT_CLASSIFICATION=    Applications/System Utilities
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
TEST_TARGET = $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
PATH= $(PATH.gnu)
COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -f --install )
CONFIGURE_OPTIONS += AS="/usr/bin/gas"
CONFIGURE_OPTIONS += --with-pulse
CONFIGURE_OPTIONS += --with-oss
# common targets
build:        $(BUILD_32)
install:    $(INSTALL_32)
test:        $(NO_TEST)
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += audio/mpg123
REQUIRED_PACKAGES += library/audio/gstreamer1
REQUIRED_PACKAGES += library/audio/gstreamer1/plugin/base
@@ -60,7 +53,8 @@
REQUIRED_PACKAGES += library/libgphoto2-2
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/perl-524
REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/libpcap
REQUIRED_PACKAGES += system/library/math
components/runtime/wine/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2018 <contributor>
# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
components/runtime/wine/patches/05-configure_fPIC.patch
@@ -1,13 +1,11 @@
diff --git a/configure.ac b/configure.ac
index b9339b90aa..9c3b09eb64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -941,13 +941,19 @@ case $host_os in
--- wine-4.17/configure.orig    2022-08-18 09:20:50.879757659 +0000
+++ wine-4.17/configure    2022-08-18 09:23:59.929503472 +0000
@@ -9298,13 +9298,19 @@
     ;;
 
   *)
-    case $host_cpu in
-      *i[[3456789]]86*)
-      *i[3456789]86*)
-        DLLFLAGS="$DLLFLAGS -fno-PIC"
-        LDDLLFLAGS="-fno-PIC" ;;
-      *)
@@ -17,7 +15,7 @@
         LDDLLFLAGS="-fPIC" ;;
+      *)
+        case $host_cpu in
+          *i[[3456789]]86*)
+          *i[3456789]86*)
+            DLLFLAGS="$DLLFLAGS -fno-PIC"
+            LDDLLFLAGS="-fno-PIC" ;;
+          *)
@@ -25,8 +23,5 @@
+            LDDLLFLAGS="-fPIC" ;;
+        esac ;;
     esac
     AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf,
         [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic],
--
2.23.0
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5
 $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
components/runtime/wine/pkg5
@@ -11,7 +11,8 @@
        "library/libgphoto2-2",
        "library/libxml2",
        "library/zlib",
        "runtime/perl-524",
        "runtime/perl",
        "shell/ksh93",
        "system/library",
        "system/library/libpcap",
        "system/library/math",
components/runtime/wine/wine.p5m
@@ -14,6 +14,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)