Commit c19425d4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

0.5.7.1-alt1

- update to 0.5.7 - move code changes to patches
parent c29a1855
tar: wine-grdwine name=@name@-@version@
copy?: *.rules
copy?: *.patch
From 9eeb54a5348882ba3d89e7ee4a26a9a1687db4d5 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Sat, 29 Oct 2022 10:15:12 +0300
Subject: [PATCH] build both ELF and PE parts
To: wine-devel <wine-devel@winehq.org>
---
configure.ac | 12 ++++++++----
src/Makefile.am | 11 ++++++++---
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index d23cd41..137dcd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,14 +9,18 @@ AM_INIT_AUTOMAKE
AC_ARG_ENABLE([win64],
[AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])])
-AC_ARG_WITH([winedlls],
- [AC_HELP_STRING([--with-winedlls=PATH],[PATH to install .dll.so for Wine @<:@LIBDIR/wine@:>@])],
- [winedlls="${withval}"],[winedlls="\$(libdir)/wine"])
+AC_ARG_WITH([wineso],
+ [AC_HELP_STRING([--with-wineso=PATH],[PATH to install .dll.so for Wine @<:@LIBDIR/wine@:>@])],
+ [wineso="${withval}"],[wineso="\$(libdir)/wine"])
+AC_ARG_WITH([winepe],
+ [AC_HELP_STRING([--with-winepe=PATH],[PATH to install .dll for Wine @<:@LIBDIR/wine@:>@])],
+ [winepe="${withval}"],[wineso="\$(libdir)/wine"])
AC_ARG_WITH([wineincs],
[AC_HELP_STRING([--with-wineincs=PATH],[PATH to Wine C header files @<:@INCLUDEDIR@:>@])],
[wineincs="${withval}"],[wineincs="\$(includedir)"])
-AC_SUBST([winedlls])
+AC_SUBST([wineso])
+AC_SUBST([winepe])
AC_SUBST([wineincs])
AC_CANONICAL_HOST
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ecdcd9..f516f3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,12 +5,17 @@ grdwine_SOURCES = grdwine.spec grdwine.c grdimpl.h grdimpl_linux.c
AM_CPPFLAGS = -D__WINESRC__ -I$(wineincs) -I$(wineincs)/wine/windows
CLEANFILES = grdwine.dll.so
-grdwine$(EXEEXT): grdwine.spec grdwine.o grdimpl_linux.o grdwine.dll.so
+grdwine$(EXEEXT): grdwine.spec grdwine.o grdimpl_linux.o grdwine.dll grdwine.dll.so
true
grdwine.dll.so: grdwine.spec grdwine.o grdimpl_linux.o
$(WINEGCC) -shared $^ -o $@ -lkernel32
-install-am: grdwine.dll.so
- $(INSTALL_PROGRAM) $^ $(winedlls)/$^
+grdwine.dll: grdwine.spec
+ $(WINEGCC) -o $@ -Wb,--fake-module -shared $^ -mno-cygwin
+
+install-am: grdwine.dll.so grdwine.dll
+ $(MKDIR_P) $(winepe) $(wineso)
+ $(INSTALL_PROGRAM) grdwine.dll.so $(wineso)/grdwine.dll.so
+ $(INSTALL_PROGRAM) grdwine.dll $(winepe)/grdwine.dll
--
2.33.4
From 7bfa5a40224de7a3f9af4f0be4c862f53d0d5c95 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Sat, 29 Oct 2022 10:21:51 +0300
Subject: [PATCH] don't use DLL_WINE_PREATTACH
To: wine-devel <wine-devel@winehq.org>
---
src/grdwine.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/grdwine.c b/src/grdwine.c
index 79747f0..d2613c8 100644
--- a/src/grdwine.c
+++ b/src/grdwine.c
@@ -105,9 +105,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason)
{
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
-
case DLL_PROCESS_ATTACH:
// DisableThreadLibraryCalls(hinstDLL);
break;
--
2.33.4
......@@ -2,8 +2,8 @@
%define optflags_lto %nil
Name: wine-etersoft-grdwine
Version: 0.5.5.1
Release: alt4
Version: 0.5.7.1
Release: alt1
Summary: Guardant usb dongle helper library for Wine
......@@ -17,6 +17,9 @@ Source: %name-%version.tar
Source1: 90-grdnt.rules
Patch1: 0001-build-both-ELF-and-PE-parts.patch
Patch2: 0001-don-t-use-DLL_WINE_PREATTACH.patch
BuildRequires: libwine-devel >= 6.23
ExclusiveArch: %ix86 x86_64
......@@ -84,6 +87,8 @@ Old keys Stealth II and Stealth III are not supported here
%prep
%setup
%patch1 -p1
%patch2 -p1
%build
#autoreconf
......@@ -115,6 +120,10 @@ install -D -m0644 %SOURCE1 %buildroot%_udevrulesdir/90-grdnt.rules
%endif
%changelog
* Sat Oct 29 2022 Vitaly Lipatov <lav@altlinux.ru> 0.5.7.1-alt1
- update to 0.5.7
- move code changes to patches
* Sun Aug 14 2022 Vitaly Lipatov <lav@altlinux.ru> 0.5.5.1-alt4
- put dlls to _libdir/wine-etersoft
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment