aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSardem FF7 <sardemff7.pub@gmail.com>2011-04-23 11:26:38 +0200
committerSardem FF7 <sardemff7.pub@gmail.com>2011-04-23 11:26:38 +0200
commit3672dd81e138704c84808e0e6d657c80167f0fb2 (patch)
tree725941a2e57f3050f0a132c55a3d59d5e9eae3ea
parentBump w_scan for linux > 2.6.38 without V4L (diff)
downloadsardemff7-3672dd81e138704c84808e0e6d657c80167f0fb2.tar.gz
sardemff7-3672dd81e138704c84808e0e6d657c80167f0fb2.tar.bz2
sardemff7-3672dd81e138704c84808e0e6d657c80167f0fb2.zip
Fixed upstream
-rw-r--r--dev-util/geany-plugins/Manifest4
-rw-r--r--dev-util/geany-plugins/files/tmp-fix-revert.patch25
-rw-r--r--dev-util/geany-plugins/files/tmp-fix.patch15
-rw-r--r--dev-util/geany-plugins/geany-plugins-9999.ebuild3
4 files changed, 1 insertions, 46 deletions
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index ee0d9b1..e0c50c4 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,3 +1 @@
-AUX tmp-fix-revert.patch 611 RMD160 c6da82045cd5270e055403e1565e3c4fb4ff9a84 SHA1 5dab962fa3b8f8391370904bef63251d39793dcc SHA256 77cdea2e60d3060fe99cccd43cf4f90798ed7e16f3a34f39c1867ccc33397578
-AUX tmp-fix.patch 405 RMD160 0989fd1e160e77ee99a4e9fd57fad0c3120fb090 SHA1 244edd6eedbbdc9fa051e3fe4c9822ef1b8937e4 SHA256 73ff251c50f571224618788c073d894457d8cc6dc24b8d771a5d2687e8e0aaf7
-EBUILD geany-plugins-9999.ebuild 1795 RMD160 1aca3233af13eb79c9bf1b95e71426b19285f257 SHA1 9e2f5a62e3928881699bc22dc7940625b8f484b6 SHA256 8bca3e25ee4fd137d2d9247594956dcdfd35a122ec6c86e65b3a78a55dbd821d
+EBUILD geany-plugins-9999.ebuild 1684 RMD160 7f5f54ced299ceeb399c6197c589f28dfa77475a SHA1 04ac733a1cff43f41d915ac03e38ae4d21d6965b SHA256 b39a9d80293fa42ffa6537c83d5e8d5df3d32798ac1629a91ad8fac11600e56e
diff --git a/dev-util/geany-plugins/files/tmp-fix-revert.patch b/dev-util/geany-plugins/files/tmp-fix-revert.patch
deleted file mode 100644
index 2a48ce4..0000000
--- a/dev-util/geany-plugins/files/tmp-fix-revert.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/geany-plugins/configure.ac b/geany-plugins/configure.ac
-index 54b61c6..34a8dd9 100644
---- a/geany-plugins/configure.ac
-+++ b/geany-plugins/configure.ac
-@@ -26,9 +26,6 @@ GP_CHECK_CFLAGS
- dnl plugin checks
- GP_CHECK_ADDONS
- GP_CHECK_CODENAV
--GP_CHECK_DEBUGGER
--GP_CHECK_DEVHELP
--GP_CHECK_GEANYCFP
- GP_CHECK_GEANYDOC
- GP_CHECK_GEANYEXTRASEL
- GP_CHECK_GEANYGDB
-@@ -37,7 +34,8 @@ GP_CHECK_GEANYINSERTNUM
- GP_CHECK_GEANYLATEX
- GP_CHECK_GEANYLIPSUM
- GP_CHECK_GEANYLUA
--GP_CHECK_GEANYPG
-+GP_CHECK_GEANYMACRO
-+GP_CHECK_GEANYNUMBEREDBOOKMARKS
- GP_CHECK_GEANYPRJ
- GP_CHECK_GEANYSENDMAIL
- GP_CHECK_GEANYVC
---
diff --git a/dev-util/geany-plugins/files/tmp-fix.patch b/dev-util/geany-plugins/files/tmp-fix.patch
deleted file mode 100644
index 8c58dc3..0000000
--- a/dev-util/geany-plugins/files/tmp-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/geany-plugins/configure.ac b/geany-plugins/configure.ac
-index 54b61c6..34a8dd9 100644
---- a/geany-plugins/configure.ac
-+++ b/geany-plugins/configure.ac
-@@ -37,7 +37,9 @@ GP_CHECK_GEANYINSERTNUM
- GP_CHECK_GEANYLATEX
- GP_CHECK_GEANYLIPSUM
- GP_CHECK_GEANYLUA
- GP_CHECK_GEANYPG
-+GP_CHECK_GEANYMACRO
-+GP_CHECK_GEANYNUMBEREDBOOKMARKS
- GP_CHECK_GEANYPRJ
- GP_CHECK_GEANYSENDMAIL
- GP_CHECK_GEANYVC
---
diff --git a/dev-util/geany-plugins/geany-plugins-9999.ebuild b/dev-util/geany-plugins/geany-plugins-9999.ebuild
index 35321a1..e9f2399 100644
--- a/dev-util/geany-plugins/geany-plugins-9999.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-9999.ebuild
@@ -49,9 +49,6 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- EPATCH_OPTS="-R" epatch "${FILESDIR}"/tmp-fix-revert.patch || die
- epatch "${FILESDIR}"/tmp-fix.patch || die
-
# LINGUAS hack
pushd po &>/dev/null
for l in $LINGUAS; do