summaryrefslogtreecommitdiff
path: root/libre/xulrunner-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/xulrunner-libre')
-rw-r--r--libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch281
-rw-r--r--libre/xulrunner-libre/PKGBUILD98
-rw-r--r--libre/xulrunner-libre/mozconfig32
-rw-r--r--libre/xulrunner-libre/mozilla-pkgconfig.patch40
-rw-r--r--libre/xulrunner-libre/shared-libs.patch12
5 files changed, 0 insertions, 463 deletions
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
deleted file mode 100644
index b7bd659a0..000000000
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Tue, 5 Jun 2012 08:57:06 +0200
-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
-
-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
---- a/browser/components/migration/content/migration.js
-+++ b/browser/components/migration/content/migration.js
-@@ -249,7 +249,7 @@ var MigrationWizard = {
- }
-
- var brandBundle = document.getElementById("brandBundle");
-- // These strings don't exist when not using official branding. If that's
-+ // These strings may not exist when not using official branding. If that's
- // the case, just skip this page.
- try {
- var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
-@@ -281,8 +281,8 @@ var MigrationWizard = {
- case "chrome":
- source = "sourceNameChrome";
- break;
-- case "firefox":
-- source = "sourceNameFirefox";
-+ case "self":
-+ source = "brand";
- break;
- }
-
-@@ -292,7 +292,12 @@ var MigrationWizard = {
- var oldHomePageURL = this._migrator.sourceHomePageURL;
-
- if (oldHomePageURL && source) {
-- var appName = MigrationUtils.getLocalizedString(source);
-+ var appName;
-+ if (source == "brand") {
-+ appName = brandBundle.GetStringFromName("brandFullName");
-+ } else {
-+ appName = MigrationUtils.getLocalizedString(source);
-+ }
- var oldHomePageLabel =
- brandBundle.getFormattedString("homePageImport", [appName]);
- var oldHomePage = document.getElementById("oldHomePage");
-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f030756..23e37ff 100644
---- a/browser/components/migration/content/migration.xul
-+++ b/browser/components/migration/content/migration.xul
-@@ -42,7 +42,7 @@
- #elifdef XP_UNIX
- <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
- #endif
-- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
-+ <radio id="self" hidden="true"/>
- <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
- </radiogroup>
- <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 52722e9..0448444 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
-
-
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
-
- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 1f60879..fc83a99 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
- * @see nsIStringBundle
- */
- getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
-- const OVERRIDES = {
-- "4_firefox": "4_firefox_history_and_bookmarks"
-- };
-- aKey = OVERRIDES[aKey] || aKey;
--
- if (aReplacements === undefined)
- return getMigrationBundle().GetStringFromName(aKey);
- return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
- },
-
- /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ canMigrate:
-+ function MU_canMigrate(aMigratorKey) {
-+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+ },
-+
-+ /**
- * Cleans up references to migrators and nsIProfileInstance instances.
- */
- finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index f67823b..36016b8 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
-
- ProfileMigrator.prototype = {
- migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
- QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
- classDescription: "Profile Migrator",
- contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey "S">
- <!ENTITY importFromChrome.label "Chrome">
- <!ENTITY importFromChrome.accesskey "C">
--<!ENTITY importFromFirefox.label "Firefox">
--<!ENTITY importFromFirefox.accesskey "X">
-
- <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
-
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 260bc29..52b32cc 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -8,7 +8,6 @@ profileName_format=%S %S
- sourceNameIE=Internet Explorer
- sourceNameSafari=Safari
- sourceNameChrome=Google Chrome
--sourceNameFirefox=Mozilla Firefox
-
- importedBookmarksFolder=From %S
-
-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
-
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
-
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
-
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
-
- 32_ie=Favorites
- 32_safari=Bookmarks
-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox=Bookmarks Backups
-+64_self=Bookmarks Backups
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 96cedd3..a0f8a75 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -42,7 +42,7 @@ toolkit.jar:
- + content/global/mozilla.xhtml (mozilla.xhtml)
- content/global/nsDragAndDrop.js (nsDragAndDrop.js)
- content/global/resetProfile.css (resetProfile.css)
--* content/global/resetProfile.js (resetProfile.js)
-+ content/global/resetProfile.js (resetProfile.js)
- content/global/resetProfile.xul (resetProfile.xul)
- content/global/resetProfileProgress.xul (resetProfileProgress.xul)
- content/global/treeUtils.js (treeUtils.js)
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index dcb4065..09c1146 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -36,13 +36,13 @@ function resetSupported() {
- getService(Ci.nsIToolkitProfileService);
- let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--
- // Reset is only supported for the default profile if the self-migrator used for reset exists.
- try {
-- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
-+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+ return ("canMigrate" in pm) && pm.canMigrate("self");
-+ }
- } catch (e) {
- // Catch exception when there is no selected profile.
- Cu.reportError(e);
-@@ -53,9 +53,6 @@ function resetSupported() {
- function getMigratedData() {
- Components.utils.import("resource:///modules/MigrationUtils.jsm");
-
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--
- // From migration.properties
- const MIGRATED_TYPES = [
- 4, // History and Bookmarks
-@@ -68,7 +65,7 @@ function getMigratedData() {
- let dataTypes = [];
- for (let itemID of MIGRATED_TYPES) {
- try {
-- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
- dataTypes.push(typeName);
- } catch (x) {
- // Catch exceptions when the string for a data type doesn't exist.
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
- * @client Toolkit (Startup code)
- * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
- */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports
- {
- /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
- * @note The startup code ignores COM exceptions thrown from this method.
- */
- void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+ /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ bool canMigrate(in ACString aKey);
- };
-
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 1045665..04bd1aa 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- }
- pm->Migrate(&mDirProvider, aKey);
- }
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
deleted file mode 100644
index 5b21529b4..000000000
--- a/libre/xulrunner-libre/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 180163 2013-03-18 13:29:32Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-# With many changes from iceweasel-libre.
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=19.0.2
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=xulrunner
-pkgname=xulrunner-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
- mozconfig
- mozilla-pkgconfig.patch
- shared-libs.patch
- Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-options=('!emptydirs')
-conflicts=('xulrunner')
-provides=("xulrunner=${_debver}")
-replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('ceda63e01012f9940542d862fd755a65'
- '7fa6e0fb544d01516d3232f26023c570'
- '7f3317c25308a631ca31d8d280991bb4'
- '27271ce647a83906ef7a24605e840d61'
- '52e52f840a49eb1d14be1c0065b03a93'
- '2fde2f4bc158b217f3d71b33ef0bc626')
-
-build() {
- # WebRTC build tries to execute "python" and expects Python 2
- # Workaround taken from chromium PKGBUILD on Archlinux
- mkdir "$srcdir/python2-path"
- ln -s /usr/bin/python2 "$srcdir/python2-path/python"
- export PATH="$srcdir/python2-path:$PATH"
-
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
- export PYTHON="/usr/bin/python2"
-
- export QUILT_PATCHES=debian/patches
- export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
- export QUILT_DIFF_ARGS='--no-timestamps'
-
- mv mozilla-release "${_debname}-${_debver}"
- mv debian "${_debname}-${_debver}"
- cd "${_debname}-${_debver}"
-
- # Doesn't apply and seems unimportant
- rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
- # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
- rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
- quilt push -a
- find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
-
- cp "$srcdir/mozconfig" .mozconfig
-
- # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
- patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
-
- # Fails, claiming the page size to have changed.
- [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-
- #fix libdir/sdkdir - fedora
- patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
- patch -Np1 -i "$srcdir/shared-libs.patch"
-
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
- cd "${_debname}-${_debver}"
- make -j1 -f client.mk DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/usr/lib/xulrunner-${_debver::4}/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver::4}/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver::4}/hyphenation"
-
- # add xulrunner library path to ld.so.conf
- install -d $pkgdir/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
- chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
- "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
-}
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
deleted file mode 100644
index 7c6cd106d..000000000
--- a/libre/xulrunner-libre/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-#ac_add_options --enable-gstreamer
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/libre/xulrunner-libre/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
-
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- -e "s|%includedir%|$(includedir)|" \
- -e "s|%idldir%|$(idldir)|" \
- -e "s|%sdkdir%|$(sdkdir)|" \
-+ -e "s|%libdir%|$(installdir)|" \
- -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre/xulrunner-libre/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
-
- MOZ_NONLOCALIZED_PKG_LIST = \
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-07-24 10:10:35 +0000