diff --git a/srcpkgs/winusb/patches/wxwidget-compatible.patch b/srcpkgs/winusb/patches/wxwidget-compatible.patch new file mode 100644 index 00000000000..a0444567a53 --- /dev/null +++ b/srcpkgs/winusb/patches/wxwidget-compatible.patch @@ -0,0 +1,19 @@ +--- src/findFile.cpp 2013-03-27 22:57:44.000000000 +0100 ++++ src/findFile.cpp 2014-02-17 17:16:01.256683107 +0100 +@@ -37,14 +37,14 @@ + } + + #if defined(__UNIX__) +- testPath = wxString(wxStandardPaths().GetInstallPrefix() + _T("/share/") + _T(PACKAGE) + _T("/") + str); ++ testPath = wxString(wxStandardPaths::Get().GetInstallPrefix() + _T("/share/") + _T(PACKAGE) + _T("/") + str); + if(wxFileExists(testPath) || wxDirExists(testPath)) // Si c'est dans le dossier /usr/.../share/nomprog + { + return testPath; + } + #endif // defined(__UNIX__) + +- testPath = wxString(wxStandardPaths().GetDataDir() + _T("/") + str); ++ testPath = wxString(wxStandardPaths::Get().GetDataDir() + _T("/") + str); + if(wxFileExists(testPath) || wxDirExists(testPath)) // Si c'est dans le dossier /usr/.../share/nomPaquet + { + return testPath; diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template index de3a5b163a5..c1d5715a0a7 100644 --- a/srcpkgs/winusb/template +++ b/srcpkgs/winusb/template @@ -1,15 +1,16 @@ # Template file for 'winusb' pkgname=winusb version=1.0.11 -revision=3 +revision=4 only_for_archs="i686 x86_64 i686-musl x86_64-musl" build_style=gnu-configure +configure_args="--with-wx-config=wx-config-3.0" hostmakedepends="pkg-config" -makedepends="wxGTK-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme" +makedepends="wxWidgets-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme" short_desc="Simple tool that enable you to create your own usb stick windows installer" depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi" maintainer="Juan RP " license="GPL-3" homepage="http://en.congelli.eu/prog_info_winusb.html" -distfiles="http://www6.frugalware.org/mirrors/linux/frugalware/frugalware-current/source/xapps-extra/winusb/winusb-${version}.tar.gz" +distfiles="ftp://ftp.freebsd.ch/gentoo/distfiles/winusb-${version}.tar.gz" checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9