public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] lcdproc: Update to 0.5.7
@ 2016-04-13 14:50 Sascha Kilian
  0 siblings, 0 replies; 6+ messages in thread
From: Sascha Kilian @ 2016-04-13 14:50 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 958 bytes --]

Signed-off-by: Sascha Kilian sascha(a)sakisoft.de
---
 lfs/lcdproc |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lfs/lcdproc b/lfs/lcdproc
index 9e88622..da1abc8 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.6
+VER        = 0.5.7
 
 THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
+$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] lcdproc: Update to 0.5.7
@ 2016-04-13 15:04 Sascha Kilian
  0 siblings, 0 replies; 6+ messages in thread
From: Sascha Kilian @ 2016-04-13 15:04 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1850 bytes --]


Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
---
 lfs/lcdproc                              |    5 ++---
 src/patches/lcdproc-0.5.6-menuitem.patch |   11 -----------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 src/patches/lcdproc-0.5.6-menuitem.patch

diff --git a/lfs/lcdproc b/lfs/lcdproc
index 9e88622..da1abc8 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.6
+VER        = 0.5.7
 
 THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
+$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch
deleted file mode 100644
index b9e933d..0000000
--- a/src/patches/lcdproc-0.5.6-menuitem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/menuitem.c	2012/04/25 19:53:15	1.37
-+++ server/menuitem.c	2013/01/17 21:27:27	1.38
-@@ -33,6 +33,8 @@
- 
- #define MAX_NUMERIC_LEN 40
- 
-+extern Menu *main_menu;		/* Access to the main menu */
-+
- char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"};
- char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"};
- char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"};
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] lcdproc: Update to 0.5.7
@ 2016-04-13 14:45 Sascha Kilian
  0 siblings, 0 replies; 6+ messages in thread
From: Sascha Kilian @ 2016-04-13 14:45 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 914 bytes --]

---
 src/patches/lcdproc-0.5.6-menuitem.patch |   11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 src/patches/lcdproc-0.5.6-menuitem.patch

diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch
deleted file mode 100644
index b9e933d..0000000
--- a/src/patches/lcdproc-0.5.6-menuitem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/menuitem.c	2012/04/25 19:53:15	1.37
-+++ server/menuitem.c	2013/01/17 21:27:27	1.38
-@@ -33,6 +33,8 @@
- 
- #define MAX_NUMERIC_LEN 40
- 
-+extern Menu *main_menu;		/* Access to the main menu */
-+
- char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"};
- char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"};
- char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"};
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] lcdproc: Update to 0.5.7
       [not found] <006b01d1958a$6b04d7c0$410e8740$@sakisoft.de>
  2016-04-13 13:49 ` Michael Tremer
@ 2016-04-13 14:17 ` Marcel Lorenz
  1 sibling, 0 replies; 6+ messages in thread
From: Marcel Lorenz @ 2016-04-13 14:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1556 bytes --]

Hi Sascha,

replace 
"https://sourceforge.net/projects/lcdproc/files/lcdproc/0.5.7/lcd" with 
"$(THISAPP).tar.gz"
This must remain as original and remove the patch with "git rm 
patchname" if not more needed.
Then sumbit new...

Best,
Marcel


Am 2016-04-13 15:43, schrieb Sascha Kilian:
> lcdproc update to 0.5.7
> 
> Signed-off-by: Sascha Kilian sascha(a)sakisoft.de
> 
> diff --git a/lfs/lcdproc b/lfs/lcdproc
> 
> index 9e88622..15a5e2b 100644
> 
> --- a/lfs/lcdproc
> 
> +++ b/lfs/lcdproc
> 
> @@ -24,7 +24,7 @@
> 
>  include Config
> 
> -VER        = 0.5.6
> 
> +VER        = 0.5.7
> 
>  THISAPP    = lcdproc-$(VER)
> 
>  DL_FILE    = $(THISAPP).tar.gz
> 
> @@ -42,9 +42,10 @@ DEPS       =
> 
>  objects = $(DL_FILE)
> 
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> +#$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> +$(DL_FILE) =
> https://sourceforge.net/projects/lcdproc/files/lcdproc/0.5.7/lcdproc-0.5.7.tar.gz/download
> 
> -$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
> 
> +$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
> 
>  install : $(TARGET)
> 
> @@ -77,7 +78,6 @@ $(subst %,%_MD5,$(objects)) :
> 
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 
>         @$(PREBUILD)
> 
>         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
> $(DIR_DL)/$(DL_FILE)
> 
> -       cd $(DIR_APP) && patch -Np0 <
> $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
> 
>         cd $(DIR_APP) && \
> 
>                 ./configure \
> 
>                         --prefix=/usr \


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] lcdproc: Update to 0.5.7
       [not found] <006b01d1958a$6b04d7c0$410e8740$@sakisoft.de>
@ 2016-04-13 13:49 ` Michael Tremer
  2016-04-13 14:17 ` Marcel Lorenz
  1 sibling, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2016-04-13 13:49 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

Please actually *read* the guide and then follow it.

This is not a try-and-error process.

On Wed, 2016-04-13 at 15:43 +0200, Sascha Kilian wrote:
>  
> lcdproc update to 0.5.7
> Signed-off-by: Sascha Kilian sascha(a)sakisoft.de
>  
> diff --git a/lfs/lcdproc b/lfs/lcdproc
> index 9e88622..15a5e2b 100644
> --- a/lfs/lcdproc
> +++ b/lfs/lcdproc
> @@ -24,7 +24,7 @@
>  
> include Config
>  
> -VER        = 0.5.6
> +VER        = 0.5.7
>  
> THISAPP    = lcdproc-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -42,9 +42,10 @@ DEPS       =
>  
> objects = $(DL_FILE)
>  
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +#$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +$(DL_FILE) = https://sourceforge.net/projects/lcdproc/files/lcdproc/0.5.7/lcd
> proc-0.5.7.tar.gz/download
>  
> -$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
> +$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
>  
> install : $(TARGET)
>  
> @@ -77,7 +78,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>         @$(PREBUILD)
>        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-
> menuitem.patch
>         cd $(DIR_APP) && \
>                 ./configure \
>                         --prefix=/usr \
>  
>  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] lcdproc: Update to 0.5.7
       [not found] <003e01d19584$31462f80$93d28e80$@sakisoft.de>
@ 2016-04-13 13:14 ` Michael Tremer
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2016-04-13 13:14 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]

Hi,

could you please send patches in the standardized format described here?

  http://wiki.ipfire.org/devel/submit-patches

-Michael

On Wed, 2016-04-13 at 14:58 +0200, Sascha Kilian wrote:
> Hi,
>  
> i hope this is conformabler as my first lcdproc patch
>  
> Signed-off-by Sascha Kilian sascha(a)sakisoft.de
>  
> diff --git a/lfs/lcdproc b/lfs/lcdproc
> index 9e88622..15a5e2b 100644
> --- a/lfs/lcdproc
> +++ b/lfs/lcdproc
> @@ -24,7 +24,7 @@
>  
> include Config
>  
> -VER        = 0.5.6
> +VER        = 0.5.7
>  
> THISAPP    = lcdproc-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -42,9 +42,10 @@ DEPS       =
>  
> objects = $(DL_FILE)
>  
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +#$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +$(DL_FILE) = https://sourceforge.net/projects/lcdproc/files/lcdproc/0.5.7/lcd
> proc-0.5.7.tar.gz/download
>  
> -$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
> +$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
>  
> install : $(TARGET)
>  
> @@ -77,7 +78,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>         @$(PREBUILD)
>         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-
> menuitem.patch
>         cd $(DIR_APP) && \
>                 ./configure \
>                         --prefix=/usr \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-13 15:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-13 14:50 [PATCH] lcdproc: Update to 0.5.7 Sascha Kilian
  -- strict thread matches above, loose matches on Subject: below --
2016-04-13 15:04 Sascha Kilian
2016-04-13 14:45 Sascha Kilian
     [not found] <006b01d1958a$6b04d7c0$410e8740$@sakisoft.de>
2016-04-13 13:49 ` Michael Tremer
2016-04-13 14:17 ` Marcel Lorenz
     [not found] <003e01d19584$31462f80$93d28e80$@sakisoft.de>
2016-04-13 13:14 ` Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox