Browse Source

sync 1377445 port with Firefox version

Bill Gianopoulos 3 years ago
parent
commit
08f0ec742a
1 changed files with 3 additions and 8 deletions
  1. 3 8
      comm-central/patches/9999999-port-bug1377445-suite.patch

+ 3 - 8
comm-central/patches/9999999-port-bug1377445-suite.patch

@@ -9,8 +9,7 @@ Bug 1377445 - Firefox should allow building without gtk2.
 diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
 --- a/suite/installer/package-manifest.in
 +++ b/suite/installer/package-manifest.in
-@@ -129,23 +129,19 @@
- #ifndef MOZ_FOLD_LIBS
+@@ -130,18 +130,16 @@
  @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
  #endif
  @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
@@ -18,18 +17,14 @@ diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manif
  @BINPATH@/@DLL_PREFIX@mozavutil@DLL_SUFFIX@
  @BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
  #endif
--#ifdef MOZ_GTK
+ #ifdef MOZ_GTK
 -@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 -@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
  #ifdef MOZ_WAYLAND
  @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
  #endif
--#endif
+ #endif
  @RESPATH@/license.txt
  @RESPATH@/blocklist.xml
  #ifdef XP_WIN
  #ifdef _AMD64_
- @BINPATH@/@DLL_PREFIX@qipcap64@DLL_SUFFIX@
- #else
- @BINPATH@/@DLL_PREFIX@qipcap@DLL_SUFFIX@
- #endif