From 8073750c5c69bb218d6555af3526a130b9ef7054 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 28 Sep 2015 16:03:24 +0200 Subject: [PATCH] Staging: Update bug reporting URL. --- ...ediag-message-to-show-warning-that-t.patch | 15 +- ...ge-bug-reporting-URL-to-Wine-Staging.patch | 867 ------------------ ...Staging-at-the-end-of-the-version-s.patch} | 0 ...dline-option-patches-to-show-the-pa.patch} | 0 ...r-Add-commandline-option-check-libs.patch} | 0 ...ary-paths-for-check-libs-on-Mac-OS-.patch} | 0 patches/patchinstall.sh | 17 +- 7 files changed, 12 insertions(+), 887 deletions(-) delete mode 100644 patches/Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch rename patches/Staging/{0003-winelib-Append-Staging-at-the-end-of-the-version-s.patch => 0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch} (100%) rename patches/Staging/{0004-loader-Add-commandline-option-patches-to-show-the-pa.patch => 0003-loader-Add-commandline-option-patches-to-show-the-pa.patch} (100%) rename patches/Staging/{0005-loader-Add-commandline-option-check-libs.patch => 0004-loader-Add-commandline-option-check-libs.patch} (100%) rename patches/Staging/{0006-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch => 0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch} (100%) diff --git a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch index 6cbe14ee..0005d796 100644 --- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch +++ b/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch @@ -1,15 +1,15 @@ -From 598daa857778080524e3de4a5668a834ab084564 Mon Sep 17 00:00:00 2001 +From a41dac0b19ec2ba3807da4ac42d77717d79f1115 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:44:31 +0200 Subject: kernel32: Add winediag message to show warning, that this isn't vanilla wine. --- - dlls/kernel32/process.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) + dlls/kernel32/process.c | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c -index 2c8074b..70b2579 100644 +index b0c06e3..a2c1d4c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -65,6 +65,7 @@ @@ -20,15 +20,14 @@ index 2c8074b..70b2579 100644 #ifdef __APPLE__ extern char **__wine_get_main_environment(void); -@@ -1099,6 +1100,15 @@ static DWORD WINAPI start_process( PEB *peb ) +@@ -1099,6 +1100,14 @@ static DWORD WINAPI start_process( PEB *peb ) DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); -+ /* Wine developers don't like it, when bug are reported with Wine versions containing our patches. */ + if (CreateEventA(0, 0, 0, "__winestaging_warn_event") && GetLastError() != ERROR_ALREADY_EXISTS) + { + FIXME_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version()); -+ FIXME_(winediag)("Please report bugs at http://bugs.wine-staging.com (instead of winehq.org).\n"); ++ FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n"); + } + else + WARN_(winediag)("Wine Staging %s is a testing version containing experimental patches.\n", wine_get_version()); @@ -37,5 +36,5 @@ index 2c8074b..70b2579 100644 if (peb->BeingDebugged) DbgBreakPoint(); return call_process_entry( peb, entry ); -- -2.4.1 +2.5.1 diff --git a/patches/Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch b/patches/Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch deleted file mode 100644 index 3a5a5b10..00000000 --- a/patches/Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch +++ /dev/null @@ -1,867 +0,0 @@ -From 7e1ae1f21953e5d07cc981d9265245ac71426a12 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 29 Nov 2014 21:02:57 +0100 -Subject: winedbg: Change bug reporting URL to Wine Staging. - ---- - po/ar.po | 4 ++-- - po/bg.po | 2 +- - po/ca.po | 4 ++-- - po/cs.po | 4 ++-- - po/da.po | 2 +- - po/de.po | 4 ++-- - po/el.po | 2 +- - po/en.po | 4 ++-- - po/en_US.po | 4 ++-- - po/eo.po | 2 +- - po/es.po | 4 ++-- - po/fa.po | 2 +- - po/fi.po | 6 +++--- - po/fr.po | 6 +++--- - po/he.po | 4 ++-- - po/hi.po | 2 +- - po/hr.po | 2 +- - po/hu.po | 4 ++-- - po/it.po | 4 ++-- - po/ja.po | 6 +++--- - po/ko.po | 4 ++-- - po/lt.po | 6 +++--- - po/ml.po | 2 +- - po/nb_NO.po | 4 ++-- - po/nl.po | 6 +++--- - po/or.po | 2 +- - po/pa.po | 2 +- - po/pl.po | 4 ++-- - po/pt_BR.po | 6 +++--- - po/pt_PT.po | 2 +- - po/rm.po | 2 +- - po/ro.po | 2 +- - po/ru.po | 6 +++--- - po/sk.po | 2 +- - po/sl.po | 6 +++--- - po/sr_RS@cyrillic.po | 4 ++-- - po/sr_RS@latin.po | 4 ++-- - po/sv.po | 4 ++-- - po/te.po | 2 +- - po/th.po | 2 +- - po/tr.po | 4 ++-- - po/uk.po | 4 ++-- - po/wa.po | 2 +- - po/wine.pot | 2 +- - po/zh_CN.po | 4 ++-- - po/zh_TW.po | 4 ++-- - programs/winedbg/winedbg.rc | 2 +- - 47 files changed, 83 insertions(+), 83 deletions(-) - -diff --git a/po/ar.po b/po/ar.po -index f62d86d..426d3b6 100644 ---- a/po/ar.po -+++ b/po/ar.po -@@ -13726,12 +13726,12 @@ msgstr "تفاصيل خطأ البرنامج" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "إذا كانت المشكلة غير موجودة عند تشغيل البرنامج في بيئة وندوز ، وفي حال لم " - "يتم التبليغ عنها مسبقًا يمكنك حفظ التفاصيل بالضغط على زر \"الحفظ كـ\" ثمّ أبلغ عن العلّة وأرفق الملف الذي " -+"href=\"http://bugs.wine-staging.com\">أبلغ عن العلّة وأرفق الملف الذي " - "حفظته في إبلاغك." - - #: winedbg.rc:38 -diff --git a/po/bg.po b/po/bg.po -index f0821de..662c8c7 100644 ---- a/po/bg.po -+++ b/po/bg.po -@@ -13569,7 +13569,7 @@ msgstr "Program Files" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/ca.po b/po/ca.po -index ab2938a..97977d3 100644 ---- a/po/ca.po -+++ b/po/ca.po -@@ -13841,12 +13841,12 @@ msgstr "Detalls d'error de programa" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Si aquest problema no està present en el Windows i encara no s'ha reportat, " - "podeu desar la informació detallada a un fitxer utilitzant el botó " --"\"Anomenar i Desar\", i llavors presentar un informe d'error i ajuntar aquest fitxer a l'informe." - - #: winedbg.rc:38 -diff --git a/po/cs.po b/po/cs.po -index 90a1185..6774d42 100644 ---- a/po/cs.po -+++ b/po/cs.po -@@ -13614,12 +13614,12 @@ msgstr "Podrobnosti chyby programu" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Pokud se tento problém v Microsoft Windows neprojevuje a nebyl doposud " - "nahlášen, je možné uložit podrobné informace do souboru kliknutím na " --"tlačítko „Uložit jako“ a následně vyplnit hlášení o chybě a tento soubor k němu připojit." - - #: winedbg.rc:38 -diff --git a/po/da.po b/po/da.po -index c3512e7..7fb9908 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -13876,7 +13876,7 @@ msgstr "Programfejl detaljer" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Hvis dette problem ikke er til stede under Windows, og det endnu ikke er " -diff --git a/po/de.po b/po/de.po -index 63a2bea..29e1f6e 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -13815,12 +13815,12 @@ msgstr "Programmfehler-Details" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Tritt dieses Problem unter Windows nicht auf und wurde es noch nicht " - "gemeldet, können Sie mit \"Speichern unter\" die detaillierten Informationen " --"in einer Datei speichern, danach einen Fehlerbericht hinterlassen und die Datei dort anhängen." - - #: winedbg.rc:38 -diff --git a/po/el.po b/po/el.po -index 064ad61..6bc2818 100644 ---- a/po/el.po -+++ b/po/el.po -@@ -13313,7 +13313,7 @@ msgstr "" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/en.po b/po/en.po -index d115da0..c8ed8f5 100644 ---- a/po/en.po -+++ b/po/en.po -@@ -13716,12 +13716,12 @@ msgstr "Program Error Details" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - - #: winedbg.rc:38 -diff --git a/po/en_US.po b/po/en_US.po -index e9f16b9..355cecc 100644 ---- a/po/en_US.po -+++ b/po/en_US.po -@@ -13716,12 +13716,12 @@ msgstr "Program Error Details" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - - #: winedbg.rc:38 -diff --git a/po/eo.po b/po/eo.po -index 638a08c..f3d6e9b 100644 ---- a/po/eo.po -+++ b/po/eo.po -@@ -13180,7 +13180,7 @@ msgstr "Detaloj pri programa eraro" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/es.po b/po/es.po -index ab62ced..0cd7838 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -13972,12 +13972,12 @@ msgstr "Detalles del error de programa" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Si este problema no esta presente en Windows y no ha sido informado todavía, " - "puedes salvar la información detallada usando el botón \"Salvar Como\", " --"entonces podrás informar de un " -+"entonces podrás informar de un " - "error y adjuntar ese archivo al informe de fallo." - - #: winedbg.rc:38 -diff --git a/po/fa.po b/po/fa.po -index c7b4ad1..7c0e129 100644 ---- a/po/fa.po -+++ b/po/fa.po -@@ -13321,7 +13321,7 @@ msgstr "" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/fi.po b/po/fi.po -index ee88075..c27e0c6 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -13691,13 +13691,13 @@ msgstr "Ohjelman virhetiedot" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Jos tätä ongelmaa ei esiinny Windowsin kanssa eikä sitä ole vielä " - "raportoitu, voit tallentaa yksityiskohtaisemmat tiedot tiedostoon Tallenna " --"nimellä -kohdassa ja sitten lähettää " --"virheraportin ja liittää tiedoston raporttiin." -+"nimellä -kohdassa ja sitten lähettää virheraportin ja liittää tiedoston raporttiin." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/fr.po b/po/fr.po -index a61ec2f..615f48d 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -13890,13 +13890,13 @@ msgstr "Détails de l'erreur du programme" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " - "vous pouvez enregistrer les informations détaillées dans un fichier en " --"utilisant le bouton « Enregistrer sous », et ensuite soumettre un rapport d'anomalie en y attachant ledit " -+"utilisant le bouton « Enregistrer sous », et ensuite soumettre un rapport d'anomalie en y attachant ledit " - "fichier." - - #: winedbg.rc:38 -diff --git a/po/he.po b/po/he.po -index bd9f084..b102e62 100644 ---- a/po/he.po -+++ b/po/he.po -@@ -14014,7 +14014,7 @@ msgstr "" - "לכתובת http://appdb.winehq.org לקבלת עצות להרצת יישום זה.\n" - "\n" - "אם תקלה זו אינה קיימת בעת הרצת Windows ולא דווח עליה עדיין, ניתן לדווח עליה " --"בכתובת http://bugs.winehq.org." -+"בכתובת http://bugs.wine-staging.com." - - #: winedbg.rc:61 - #, fuzzy -@@ -14030,7 +14030,7 @@ msgstr "שגיאה בתכנית" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/hi.po b/po/hi.po -index a13c0ba..9079d10 100644 ---- a/po/hi.po -+++ b/po/hi.po -@@ -13089,7 +13089,7 @@ msgstr "सूचना (&o)" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/hr.po b/po/hr.po -index b96dfc7..49b9329 100644 ---- a/po/hr.po -+++ b/po/hr.po -@@ -13413,7 +13413,7 @@ msgstr "Detalji greške programa" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/hu.po b/po/hu.po -index c44140f..3677a0e 100644 ---- a/po/hu.po -+++ b/po/hu.po -@@ -13885,12 +13885,12 @@ msgstr "Program hibarészletező" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Ha ez a probléma még nincs jelen Windows alatt és nem lett lejelentve, " - "lementheti a részletes információt egy fájlba a Mentés másként nyomógomb " --"használatával, azután fájl " -+"használatával, azután fájl " - "hibajelentéshez és csatolja azt a fájlt a jelentéshez." - - #: winedbg.rc:38 -diff --git a/po/it.po b/po/it.po -index fbd7d3a..2a72f94 100644 ---- a/po/it.po -+++ b/po/it.po -@@ -13976,12 +13976,12 @@ msgstr "Dettagli dell'errore del programma" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Se questo problema non è presente sotto Windows e non è stato ancora " - "riportato, puoi salvare le informazioni dettagliate su un file usando il " --"pulsante \"Salva con nome\", poi segnalalo e allega quel file al report del bug." - - #: winedbg.rc:38 -diff --git a/po/ja.po b/po/ja.po -index a8b8fcb..df9c8e1 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -13712,12 +13712,12 @@ msgstr "プログラム エラーの詳細" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "この問題が Windows 上で発生することがなくまだ報告されていない場合は、[保存す" --"る]ボタンを利用して詳細情報を保存した上で、 バグ レポートを作成し、そのファイルをレポートに添付できます。" -+"る]ボタンを利用して詳細情報を保存した上で、 バグ レポートを作成し、そのファイルをレポートに添付できます。" - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/ko.po b/po/ko.po -index 2841e16..2f9e3b2 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -13756,12 +13756,12 @@ msgstr "자세한 프로그램 에러" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "만약 이 문제가 윈도우즈에는 존재하지 않고 아직 보고되지 않았다면,당신은 \"다" - "른 이름으로 저장\" 버튼을 사용해서 자세한 정보를 파일로 저장해서, 버그 보고 파일로 가서보고서에 파일을 같" -+"\"http://bugs.wine-staging.com\">버그 보고 파일로 가서보고서에 파일을 같" - "이 올리수 있습니다." - - #: winedbg.rc:38 -diff --git a/po/lt.po b/po/lt.po -index fd969b5..4fa54d2 100644 ---- a/po/lt.po -+++ b/po/lt.po -@@ -13730,13 +13730,13 @@ msgstr "Išsamiau apie programos klaidą" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Jei šios problemos nėra „Windows“ sistemoje ir apie ją dar nebuvo pranešta, " - "galite išsaugoti išsamią informaciją į failą naudodami mygtuką „Išsaugoti " --"kaip“, tada užregistruoti klaidą " --"ir prikabinti tą failą prie pranešimo." -+"kaip“, tada užregistruoti klaidą ir prikabinti tą failą prie pranešimo." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/ml.po b/po/ml.po -index e99615d..48cfedb 100644 ---- a/po/ml.po -+++ b/po/ml.po -@@ -13089,7 +13089,7 @@ msgstr "വി_വരം" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/nb_NO.po b/po/nb_NO.po -index ac2b82f..5d00699 100644 ---- a/po/nb_NO.po -+++ b/po/nb_NO.po -@@ -13779,12 +13779,12 @@ msgstr "Detaljer for programfeil" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Hvis dette problemet ikke oppstår i Windows og ikke har blitt rapportert " - "ennå, så kan du lagre detaljert informasjon til en fil ved å trykke på " --"«Lagre som»-knappen. Deretter kan du opprette en feilrapport og legge ved loggfilen." - - #: winedbg.rc:38 -diff --git a/po/nl.po b/po/nl.po -index 6f05f9a..be13ba0 100644 ---- a/po/nl.po -+++ b/po/nl.po -@@ -13931,7 +13931,7 @@ msgstr "" - "Database naar tips voor dit programma.\n" - "\n" - "Als dit probleem niet optreedt onder Windows en nog niet is gerapporteerd, " --"dan kunt u een bug rapporteren." -+"dan kunt u een bug rapporteren." - - #: winedbg.rc:61 - msgid "Show &Details" -@@ -13945,13 +13945,13 @@ msgstr "Programmafout details" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " - "niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " - "opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via file a bug report versturen." -+"bugs.wine-staging.com\">file a bug report versturen." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/or.po b/po/or.po -index 8c091dd..9648d3e 100644 ---- a/po/or.po -+++ b/po/or.po -@@ -13089,7 +13089,7 @@ msgstr "ସୂଚନା (&o)" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/pa.po b/po/pa.po -index 9b3300e..665942e 100644 ---- a/po/pa.po -+++ b/po/pa.po -@@ -13089,7 +13089,7 @@ msgstr "ਜਾਣਕਾਰੀ(&o)" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/pl.po b/po/pl.po -index 4767698..c36d0b4 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -13788,12 +13788,12 @@ msgstr "Szczegóły błędu programu" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Jeżeli problem ten nie występuje w systemie Windows i nie został jeszcze " - "zgłoszony, to możesz zapisać szczegółowe informacje do pliku używając " --"przycisku \"Zapisz jako\", a następnie wypełnić zgłoszenie o błędzie i dołączyć ten plik do zgłoszenia." - - #: winedbg.rc:38 -diff --git a/po/pt_BR.po b/po/pt_BR.po -index 57c77a2..5d10ce0 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -13802,13 +13802,13 @@ msgstr "Detalhes do Erro do Programa" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Se este problema não está presente no Windows e não foi reportado ainda, " - "você pode salvar a informação detalhada do arquivo usando o botão \"Salvar " --"Como\", enviar um relatório de erro e anexar o arquivo ao relatório." -+"Como\", enviar um relatório de " -+"erro e anexar o arquivo ao relatório." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/pt_PT.po b/po/pt_PT.po -index ea77aba..2806ae1 100644 ---- a/po/pt_PT.po -+++ b/po/pt_PT.po -@@ -13763,7 +13763,7 @@ msgstr "Detalhes do erro no programa" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/rm.po b/po/rm.po -index fcb9129..243a739 100644 ---- a/po/rm.po -+++ b/po/rm.po -@@ -13187,7 +13187,7 @@ msgstr "" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/ro.po b/po/ro.po -index 6581c88..830967c 100644 ---- a/po/ro.po -+++ b/po/ro.po -@@ -13971,7 +13971,7 @@ msgstr "Detalii eroare de program" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/ru.po b/po/ru.po -index 7c80b4a..77222ed 100644 ---- a/po/ru.po -+++ b/po/ru.po -@@ -13724,13 +13724,13 @@ msgstr "Подробности об ошибке" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Если эта проблема отсутствует в Windows и о ней ещё никто не сообщил, вы " - "можете сохранить подробную информация в файл с помощью кнопки «Сохранить " --"как», затем сообщить об ошибке и " --"приложить этот файл к отчету." -+"как», затем сообщить об ошибке " -+"и приложить этот файл к отчету." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/sk.po b/po/sk.po -index 7fdef48..bc5ffdc 100644 ---- a/po/sk.po -+++ b/po/sk.po -@@ -13362,7 +13362,7 @@ msgstr "" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/sl.po b/po/sl.po -index 446ee95..8ecac63 100644 ---- a/po/sl.po -+++ b/po/sl.po -@@ -13911,13 +13911,13 @@ msgstr "Podrobnosti napake v programu" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Če ta težava ni prisotna na sistemu Windows in še ni bila prijavljena, vas " - "prosimo, da shranite podrobnosti napake v datoteko preko gumba \"Shrani kot" --"\", nato pa prijavite napako in ji " --"priložite ravno ustvarjeno datoteko." -+"\", nato pa prijavite napako in " -+"ji priložite ravno ustvarjeno datoteko." - - #: winedbg.rc:38 - msgid "Wine program crash" -diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po -index c32bab5..470d09e 100644 ---- a/po/sr_RS@cyrillic.po -+++ b/po/sr_RS@cyrillic.po -@@ -13864,7 +13864,7 @@ msgstr "" - "http://appdb.winehq.org за савете о покретању овог програма.\n" - "\n" - "Ако овај проблем није присутан под Windows-ом и још увек није пријављен, " --"пријавите га на http://bugs.winehq.org." -+"пријавите га на http://bugs.wine-staging.com." - - #: winedbg.rc:61 - #, fuzzy -@@ -13880,7 +13880,7 @@ msgstr "Програмска грешка" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po -index 06eb3ba..bb8fccf 100644 ---- a/po/sr_RS@latin.po -+++ b/po/sr_RS@latin.po -@@ -14005,7 +14005,7 @@ msgstr "" - "http://appdb.winehq.org za savete o pokretanju ovog programa.\n" - "\n" - "Ako ovaj problem nije prisutan pod Windows-om i još uvek nije prijavljen, " --"prijavite ga na http://bugs.winehq.org." -+"prijavite ga na http://bugs.wine-staging.com." - - #: winedbg.rc:61 - #, fuzzy -@@ -14021,7 +14021,7 @@ msgstr "Programska greška" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/sv.po b/po/sv.po -index 780a756..31fde4c 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -13665,12 +13665,12 @@ msgstr "Detaljer om programfel" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Om denna problem inte presenterar sig i Windows och ännu inte har " - "rapporterats, kan du spara detaljerna till ett fil med knappen \"Spara som\" " --"och skicka en bugrapport med " -+"och skicka en bugrapport med " - "filet som en bilaga." - - #: winedbg.rc:38 -diff --git a/po/te.po b/po/te.po -index e85c5c7..4b65d58 100644 ---- a/po/te.po -+++ b/po/te.po -@@ -13089,7 +13089,7 @@ msgstr "సమాచారము (&o)" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/th.po b/po/th.po -index c55ff68..1dbdbfd 100644 ---- a/po/th.po -+++ b/po/th.po -@@ -13357,7 +13357,7 @@ msgstr "ปรับแต่งนาฬิกา" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/tr.po b/po/tr.po -index a19121f..4dedb4a 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -13720,12 +13720,12 @@ msgstr "Program Hata Detayları" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Eğer bu problem Windows altında yoksa ve henüz rapor edilmemişse, \"Farklı " - "Kaydet\" düğmesi kullanarak ayrıntılı bilgiyi bir dosyaya kaydedebilir; " --"ardından bu dosyayı ekleyerek bir dosya hatası raporu gönderebilirsiniz." - - #: winedbg.rc:38 -diff --git a/po/uk.po b/po/uk.po -index c8a6b5b..a4bc08b 100644 ---- a/po/uk.po -+++ b/po/uk.po -@@ -13807,12 +13807,12 @@ msgstr "Дані про помилку програми" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "Якщо ця проблема відсутня з-під Windows, і про неї ще не повідомлено, Ви " - "можете зберегти детальну інформацію у файл, використовуючи кнопку \"Save As" --"\", і потім відзвітувати про " -+"\", і потім відзвітувати про " - "помилку, долучивши збережений файл до звіту." - - #: winedbg.rc:38 -diff --git a/po/wa.po b/po/wa.po -index 8dd6d6d..a396272 100644 ---- a/po/wa.po -+++ b/po/wa.po -@@ -13259,7 +13259,7 @@ msgstr "&Propietés" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/wine.pot b/po/wine.pot -index 0e42192..1b85662 100644 ---- a/po/wine.pot -+++ b/po/wine.pot -@@ -13020,7 +13020,7 @@ msgstr "" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 40c4901..02c7a46 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -13236,11 +13236,11 @@ msgstr "程序错误详情" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "若该问题在 Windows 不会出现并且未曾被报告过，您可以使用“另存为”按钮将详细信息" --"保存为一个文件，然后新建一个错误报告" -+"保存为一个文件，然后新建一个错误报告" - "并且附带上该文件。" - - #: winedbg.rc:38 -diff --git a/po/zh_TW.po b/po/zh_TW.po -index 45912e7..3944c89 100644 ---- a/po/zh_TW.po -+++ b/po/zh_TW.po -@@ -13628,11 +13628,11 @@ msgstr "程式錯誤詳細資訊" - msgid "" - "If this problem is not present under Windows and has not been reported yet, " - "you can save the detailed information to a file using the \"Save As\" " --"button, then file a bug report " -+"button, then file a bug report " - "and attach that file to the report." - msgstr "" - "如果這個問題在 Windows 之下不會出現且未曾被報告，您可以使用「另存新檔」 按鈕" --"將詳細的資訊儲存到檔案，然後發送錯誤" -+"將詳細的資訊儲存到檔案，然後發送錯誤" - "報告並附加該檔案到報告中。" - - #: winedbg.rc:38 -diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc -index 7514f9d..11de95d 100644 ---- a/programs/winedbg/winedbg.rc -+++ b/programs/winedbg/winedbg.rc -@@ -68,7 +68,7 @@ BEGIN - EDITTEXT IDC_CRASH_TXT, 4, 4, 392, 272, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP - CONTROL "If this problem is not present under Windows and has not been reported yet, \ - you can save the detailed information to a file using the \"Save As\" button, \ -- then file a bug report \ -+ then file a bug report \ - and attach that file to the report.", - IDC_STATIC_TXT2,"SysLink",0,6,285,388,32 - DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP --- -2.4.0 - diff --git a/patches/Staging/0003-winelib-Append-Staging-at-the-end-of-the-version-s.patch b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch similarity index 100% rename from patches/Staging/0003-winelib-Append-Staging-at-the-end-of-the-version-s.patch rename to patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch diff --git a/patches/Staging/0004-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch similarity index 100% rename from patches/Staging/0004-loader-Add-commandline-option-patches-to-show-the-pa.patch rename to patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch diff --git a/patches/Staging/0005-loader-Add-commandline-option-check-libs.patch b/patches/Staging/0004-loader-Add-commandline-option-check-libs.patch similarity index 100% rename from patches/Staging/0005-loader-Add-commandline-option-check-libs.patch rename to patches/Staging/0004-loader-Add-commandline-option-check-libs.patch diff --git a/patches/Staging/0006-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch b/patches/Staging/0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch similarity index 100% rename from patches/Staging/0006-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch rename to patches/Staging/0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0cdd8712..527d19cc 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2185,23 +2185,16 @@ fi # | # | Modified files: # | * dlls/kernel32/process.c, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec, include/wine/library.h, libs/wine/Makefile.in, -# | libs/wine/config.c, libs/wine/loader.c, libs/wine/wine.def, libs/wine/wine.map, loader/main.c, po/ar.po, po/bg.po, -# | po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/en.po, po/en_US.po, po/eo.po, po/es.po, po/fa.po, po/fi.po, -# | po/fr.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/ml.po, po/nb_NO.po, -# | po/nl.po, po/or.po, po/pa.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/rm.po, po/ro.po, po/ru.po, po/sk.po, po/sl.po, -# | po/sr_RS@cyrillic.po, po/sr_RS@latin.po, po/sv.po, po/te.po, po/th.po, po/tr.po, po/uk.po, po/wa.po, po/wine.pot, -# | po/zh_CN.po, po/zh_TW.po, programs/winedbg/winedbg.rc +# | libs/wine/config.c, libs/wine/loader.c, libs/wine/wine.def, libs/wine/wine.map, loader/main.c # | if test "$enable_Staging" -eq 1; then patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch - patch_apply Staging/0002-winedbg-Change-bug-reporting-URL-to-Wine-Staging.patch - patch_apply Staging/0003-winelib-Append-Staging-at-the-end-of-the-version-s.patch - patch_apply Staging/0004-loader-Add-commandline-option-patches-to-show-the-pa.patch - patch_apply Staging/0005-loader-Add-commandline-option-check-libs.patch - patch_apply Staging/0006-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch + patch_apply Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch + patch_apply Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch + patch_apply Staging/0004-loader-Add-commandline-option-check-libs.patch + patch_apply Staging/0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch ( echo '+ { "Sebastian Lackner", "kernel32: Add winediag message to show warning, that this isn'\''t vanilla wine.", 1 },'; - echo '+ { "Sebastian Lackner", "winedbg: Change bug reporting URL to Wine Staging.", 1 },'; echo '+ { "Sebastian Lackner", "winelib: Append '\''(Staging)'\'' at the end of the version string.", 1 },'; echo '+ { "Sebastian Lackner", "loader: Add commandline option --patches to show the patch list.", 1 },'; echo '+ { "Michael Müller", "loader: Add commandline option --check-libs.", 1 },';