On Tue, 31 Jan 2012 at 11:23:21 -0800, John H. Robinson, IV wrote: > Carlos R. Mafra wrote: > > I've pushed a tag 'wmaker-0.95.1' (no -crm) to the repository. > > > > The tarball can be generated by clicking the link "snapshot", and it > > would be good if it could be uploaded to www.windowmaker.org as the > > latest stable release. > > To make the "Official" tarball, you use the dist target of the snapshot. > > There is a problem with it: > > The file src/text.h is missing, causing a build error. I traced it back > to src/Makefile leaving text.h out of the wmaker_SOURCES definition. > Adding text.h to wmaker_SOURCES in src/Makefile.am sovled it. > > Patch included.
Thanks John. But the patch below should fix this for good. >From 37466f492710b267f525d62ab48812bcfeca6485 Mon Sep 17 00:00:00 2001 From: Carlos R. Mafra <[email protected]> Date: Tue, 31 Jan 2012 19:30:17 +0000 Subject: [PATCH] Remove forgotten src/text.h It should have been removed together with src/text.c in commit 215a57077c998 ("wtext killing spree"). Thanks to John Robinson for pointing it out. Signed-off-by: Carlos R. Mafra <[email protected]> --- src/menu.c | 1 - src/text.h | 66 ------------------------------------------------------------ 2 files changed, 0 insertions(+), 67 deletions(-) delete mode 100644 src/text.h diff --git a/src/menu.c b/src/menu.c index d9caa15..dd84ca2 100644 --- a/src/menu.c +++ b/src/menu.c @@ -39,7 +39,6 @@ #include "actions.h" #include "funcs.h" #include "stacking.h" -#include "text.h" #include "xinerama.h" #include "workspace.h" #include "dialog.h" diff --git a/src/text.h b/src/text.h deleted file mode 100644 index 4fca47a..0000000 --- a/src/text.h +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************** - * text.h -- a basic text field * - * Copyright (C) 1997 Robin D. Clark * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License* - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * * - * Author: Rob Clark * - * Internet: [email protected] * - * Address: 609 8th Street * - * Huntington Beach, CA 92648-4632 * - ********************************************************************/ - -#ifndef __TEXT_H__ -#define __TEXT_H__ - -#include "wcore.h" - -typedef struct { - char *txt; /* ptr to the text */ - int length; /* length of txt[] */ - int startPos; /* beginning of selected text */ - int endPos; /* end of selected text */ -} WTextBlock; /* if startPos == endPos, no txt * - * is selected... they give the * - * cursor position. */ -typedef struct { - WCoreWindow *core; - WMFont *font; - WTextBlock text; - GC gc; - GC regGC; /* the normal GC */ - GC invGC; /* inverted, for selected text */ - WMagicNumber *magic; - short xOffset; - short yOffset; - unsigned int done:1; - unsigned int blink_on:1; - unsigned int blinking:1; - unsigned int canceled:1; -} WTextInput; - - -/** PROTOTYPES ******************************************************/ -WTextInput* wTextCreate( WCoreWindow *core, int x, int y, int width, - int height ); -void wTextDestroy( WTextInput *wText ); -void wTextPaint( WTextInput *wText ); -char* wTextGetText( WTextInput *wText ); -void wTextPutText( WTextInput *wText, char *txt ); -void wTextInsert( WTextInput *wText, char *txt ); -void wTextSelect( WTextInput *wText, int start, int end ); -void wTextRefresh( WTextInput *wText ); - -#endif -- 1.7.3.4 -- To unsubscribe, send mail to [email protected].
