[patch] patch

patch (text/plain), 2.27 KB, created by Paweł Hajdan, Jr. (RETIRED) on 2013-06-25 18:22:31 UTC

--- chromium-9999-r1.ebuild.orig	2013-06-20 04:01:34.000000000 +0000
+++ chromium-9999-r1.ebuild	2013-06-25 16:56:04.441800275 +0000
@@ -132,7 +132,14 @@
 
 src_unpack() {
 	# First grab depot_tools.
-	ESVN_REVISION= subversion_fetch "http://src.chromium.org/svn/trunk/tools/depot_tools"
+	DEPOT_TOOLS_REPO="https://src.chromium.org/svn/trunk/tools/depot_tools"
+	if subversion_wc_info "${DEPOT_TOOLS_REPO}"; then
+		if [ "${ESVN_WC_URL}" != "${DEPOT_TOOLS_REPO}" ]; then
+			einfo "Removing old (http) depot_tools ${ESVN_WC_PATH}"
+			rm -rf "${ESVN_WC_PATH}" || die
+		fi
+	fi
+	ESVN_REVISION= subversion_fetch "${DEPOT_TOOLS_REPO}"
 	mv "${S}" "${WORKDIR}"/depot_tools || die
 
 	cd "${ESVN_STORE_DIR}/${PN}" || die
@@ -148,14 +155,16 @@
 
 	subversion_wc_info
 
+	cd src || die
+	${PYTHON} build/util/lastchange.py -o build/util/LASTCHANGE || die
+	${PYTHON} build/util/lastchange.py -s third_party/WebKit \
+		-o build/util/LASTCHANGE.blink || die
+
 	mkdir -p "${S}" || die
 	einfo "Copying source to ${S}"
-	rsync -rlpgo --exclude=".svn/" src/ "${S}" || die
-
-	# Display correct svn revision in about box, and log new version.
-	echo "LASTCHANGE=${ESVN_WC_REVISION}" > "${S}"/build/util/LASTCHANGE || die
+	rsync -rlpgo --exclude=".svn/" . "${S}" || die
 
-	. src/chrome/VERSION
+	. chrome/VERSION
 	elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${ESVN_WC_REVISION})"
 }
 
@@ -200,7 +209,7 @@
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/angle_dx11/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \
 		\! -path 'third_party/cros_system_api/*' \
--- files/dot-gclient.orig	2011-05-09 06:57:31.000000000 +0000
+++ files/dot-gclient	2013-06-25 16:44:54.037668207 +0000
@@ -1,9 +1,6 @@
 solutions = [
   { "name"        : "src",
-    "url"         : "http://src.chromium.org/svn/trunk/src",
-    "custom_deps" : {
-        "src/third_party/WebKit/LayoutTests": None,
-    },
-    "safesync_url": "http://chromium-status.appspot.com/lkgr",
+    "url"         : "https://src.chromium.org/svn/trunk/src",
+    "safesync_url": "https://chromium-status.appspot.com/lkgr",
   },
 ]